{% trans "Hint: only change the field you want to update." %}
diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html index 2f71320d1..100e09525 100644 --- a/apps/assets/templates/assets/user_asset_list.html +++ b/apps/assets/templates/assets/user_asset_list.html @@ -9,16 +9,6 @@ {% block content_left_head %}{% endblock %} {% block table_search %} - {% endblock %} {% block table_container %} diff --git a/apps/assets/views/admin_user.py b/apps/assets/views/admin_user.py index f5c5ddae8..713f1fc53 100644 --- a/apps/assets/views/admin_user.py +++ b/apps/assets/views/admin_user.py @@ -41,8 +41,8 @@ class AdminUserCreateView(AdminUserRequiredMixin, def get_context_data(self, **kwargs): context = { - 'app': 'assets', - 'action': 'Create admin user' + 'app': _('Assets'), + 'action': _('Create admin user') } kwargs.update(context) return super().get_context_data(**kwargs) @@ -64,8 +64,8 @@ class AdminUserUpdateView(AdminUserRequiredMixin, UpdateView): def get_context_data(self, **kwargs): context = { - 'app': 'assets', - 'action': 'Update admin user' + 'app': _('Assets'), + 'action': _('Update admin user'), } kwargs.update(context) return super().get_context_data(**kwargs) @@ -85,8 +85,8 @@ class AdminUserDetailView(AdminUserRequiredMixin, DetailView): def get_context_data(self, **kwargs): cluster_remain = Cluster.objects.exclude(admin_user=self.object) context = { - 'app': 'assets', - 'action': 'Admin user detail', + 'app': _('Assets'), + 'action': _('Admin user detail'), 'cluster_remain': cluster_remain, } kwargs.update(context) @@ -112,8 +112,8 @@ class AdminUserAssetsView(AdminUserRequiredMixin, SingleObjectMixin, ListView): def get_context_data(self, **kwargs): context = { - 'app': 'assets', - 'action': 'Admin user detail', + 'app': _('Assets'), + 'action': _('Admin user detail'), "total_amount": len(self.queryset), 'unreachable_amount': len([asset for asset in self.queryset if asset.is_connective is False]) } diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py index cd088024a..0de933395 100644 --- a/apps/assets/views/asset.py +++ b/apps/assets/views/asset.py @@ -81,8 +81,8 @@ class AssetCreateView(AdminUserRequiredMixin, CreateView): def get_context_data(self, **kwargs): context = { - 'app': 'Assets', - 'action': 'Create asset', + 'app': _('Assets'), + 'action': _('Create asset'), } kwargs.update(context) return super().get_context_data(**kwargs) @@ -138,8 +138,8 @@ class AssetBulkUpdateView(AdminUserRequiredMixin, ListView): def get_context_data(self, **kwargs): context = { - 'app': 'Assets', - 'action': 'Bulk update asset', + 'app': _('Assets'), + 'action': _('Bulk update asset'), 'form': self.form, 'assets_selected': self.id_list, } @@ -155,8 +155,8 @@ class AssetUpdateView(AdminUserRequiredMixin, UpdateView): def get_context_data(self, **kwargs): context = { - 'app': 'Assets', - 'action': 'Update asset', + 'app': _('Assets'), + 'action': _('Update asset'), } kwargs.update(context) return super(AssetUpdateView, self).get_context_data(**kwargs) @@ -176,8 +176,8 @@ class AssetDetailView(DetailView): def get_context_data(self, **kwargs): asset_groups = self.object.groups.all() context = { - 'app': 'Assets', - 'action': 'Asset detail', + 'app': _('Assets'), + 'action': _('Asset detail'), 'asset_groups_remain': [asset_group for asset_group in AssetGroup.objects.all() if asset_group not in asset_groups], 'asset_groups': asset_groups, diff --git a/apps/common/mixins.py b/apps/common/mixins.py index 534a9a013..1371cf65b 100644 --- a/apps/common/mixins.py +++ b/apps/common/mixins.py @@ -89,6 +89,7 @@ class BulkSerializerMixin(object): class DatetimeSearchMixin: + date_format = '%Y-%m-%d' date_from = date_to = None def get(self, request, *args, **kwargs): @@ -96,7 +97,7 @@ class DatetimeSearchMixin: date_to_s = self.request.GET.get('date_to') if date_from_s: - date_from = timezone.datetime.strptime(date_from_s, '%m/%d/%Y') + date_from = timezone.datetime.strptime(date_from_s, self.date_format) self.date_from = date_from.replace( tzinfo=timezone.get_current_timezone() ) @@ -105,7 +106,7 @@ class DatetimeSearchMixin: if date_to_s: date_to = timezone.datetime.strptime( - date_to_s + ' 23:59:59', '%m/%d/%Y %H:%M:%S' + date_to_s + ' 23:59:59', self.date_format + ' %H:%M:%S' ) self.date_to = date_to.replace( tzinfo=timezone.get_current_timezone() diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index e042e8436..34bc95053 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 113237989..c062db32e 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-01 00:34+0800\n" +"POT-Creation-Date: 2018-01-01 14:59+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler