haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 12:27:48 +00:00
Code Issues Releases Wiki Activity

Fix locale strings

Browse Source
This commit is contained in:
zhengxie
2016-08-03 11:57:25 +08:00
parent f3235d970a
commit 15d082a8c5
5 changed files with 25 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
locale/en/LC_MESSAGES/django.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-02 16:07+0800\n" "POT-Creation-Date: 2016-08-03 11:50+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,7 +65,7 @@ msgstr ""
msgid "Email %s invalid." msgid "Email %s invalid."
msgstr "" msgstr ""
#: seahub/api2/endpoints/invitations.py:56 #: seahub/api2/endpoints/invitations.py:56 seahub/base/accounts.py:575
#, python-format #, python-format
msgid "User %s already exists." msgid "User %s already exists."
msgstr "" msgstr ""
@@ -385,10 +385,6 @@ msgstr ""
msgid "Enter a valid email address." msgid "Enter a valid email address."
msgstr "" msgstr ""
#: seahub/base/accounts.py:575
msgid "A user with this email already"
msgstr ""
#: seahub/base/accounts.py:579 #: seahub/base/accounts.py:579
msgid "Invalid user id." msgid "Invalid user id."
msgstr "" msgstr ""
@@ -738,8 +734,8 @@ msgstr ""
#: seahub/message/templates/message/user_msg_list.html:52 #: seahub/message/templates/message/user_msg_list.html:52
#: seahub/message/templates/message/user_msg_list.html:54 #: seahub/message/templates/message/user_msg_list.html:54
#: seahub/notifications/templates/notifications/notification_list.html:33 #: seahub/notifications/templates/notifications/notification_list.html:33
#: seahub/profile/templates/profile/set_profile.html:144 #: seahub/profile/templates/profile/set_profile.html:137
#: seahub/profile/templates/profile/set_profile.html:146 #: seahub/profile/templates/profile/set_profile.html:139
#: seahub/templates/js/sysadmin-templates.html:373 #: seahub/templates/js/sysadmin-templates.html:373
#: seahub/templates/js/sysadmin-templates.html:432 #: seahub/templates/js/sysadmin-templates.html:432
#: seahub/templates/js/sysadmin-templates.html:497 #: seahub/templates/js/sysadmin-templates.html:497
@@ -2650,8 +2646,8 @@ msgid "Two-Factor Authentication"
msgstr "" msgstr ""
#: seahub/profile/templates/profile/set_profile.html:20 #: seahub/profile/templates/profile/set_profile.html:20
#: seahub/profile/templates/profile/set_profile.html:142 #: seahub/profile/templates/profile/set_profile.html:135
#: seahub/profile/templates/profile/set_profile.html:165 #: seahub/profile/templates/profile/set_profile.html:158
msgid "Delete Account" msgid "Delete Account"
msgstr "" msgstr ""
@@ -2737,43 +2733,36 @@ msgstr ""
#: seahub/profile/templates/profile/set_profile.html:118 #: seahub/profile/templates/profile/set_profile.html:118
msgid "" msgid ""
"If you don't have any device with you, you can access\n" "If you don't have any device with you, you can access your account using "
" your account using backup codes." "backup codes."
msgstr "" msgstr ""
#: seahub/profile/templates/profile/set_profile.html:120 #: seahub/profile/templates/profile/set_profile.html:119
#, python-format #, python-format
msgid "" msgid "You have only one backup code remaining."
"\n" msgid_plural "You have %(counter)s backup codes remaining."
" You have only one backup code remaining.\n"
" "
msgid_plural ""
"\n"
" You have %(counter)s backup codes remaining.\n"
" "
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: seahub/profile/templates/profile/set_profile.html:127 #: seahub/profile/templates/profile/set_profile.html:122
msgid "Show Codes" msgid "Show Codes"
msgstr "" msgstr ""
#: seahub/profile/templates/profile/set_profile.html:131 #: seahub/profile/templates/profile/set_profile.html:126
msgid "" msgid ""
"Two-factor authentication is not enabled for your\n" "Two-factor authentication is not enabled for your account. Enable two-factor "
" account. Enable two-factor authentication for enhanced account\n" "authentication for enhanced account security."
" security."
msgstr "" msgstr ""
#: seahub/profile/templates/profile/set_profile.html:135 #: seahub/profile/templates/profile/set_profile.html:128
msgid "Enable Two-Factor Authentication" msgid "Enable Two-Factor Authentication"
msgstr "" msgstr ""
#: seahub/profile/templates/profile/set_profile.html:143 #: seahub/profile/templates/profile/set_profile.html:136
msgid "This operation will not be reverted. Please think twice!" msgid "This operation will not be reverted. Please think twice!"
msgstr "" msgstr ""
#: seahub/profile/templates/profile/set_profile.html:166 #: seahub/profile/templates/profile/set_profile.html:159
msgid "Really want to delete your account?" msgid "Really want to delete your account?"
msgstr "" msgstr ""
@@ -6170,10 +6159,6 @@ msgstr ""
msgid "No conflict in the merge." msgid "No conflict in the merge."
msgstr "" msgstr ""
#: seahub/views/ajax.py:1588
msgid "Faied to change password, you are not owner."
msgstr ""
#: seahub/views/ajax.py:1694 seahub/views/ajax.py:1836 #: seahub/views/ajax.py:1694 seahub/views/ajax.py:1836
msgid "Invalid folder permission, should be \"rw\" or \"r\"" msgid "Invalid folder permission, should be \"rw\" or \"r\""
msgstr "" msgstr ""

2
locale/en/LC_MESSAGES/djangojs.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-02 16:07+0800\n" "POT-Creation-Date: 2016-08-03 11:50+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
seahub/base/accounts.py
View File

@@ -572,7 +572,7 @@ class RegistrationForm(forms.Form):
if not emailuser: if not emailuser:
return self.cleaned_data['email'] return self.cleaned_data['email']
else: else:
raise forms.ValidationError(_("A user with this email already")) raise forms.ValidationError(_("User %s already exists.") % email)
def clean_userid(self): def clean_userid(self):
if self.cleaned_data['userid'] and len(self.cleaned_data['userid']) != 40: if self.cleaned_data['userid'] and len(self.cleaned_data['userid']) != 40:

13
seahub/profile/templates/profile/set_profile.html
View File

@@ -115,22 +115,15 @@
</p> </p>
<p class="txt-before-btn"> <p class="txt-before-btn">
{% blocktrans %}If you don't have any device with you, you can access {% blocktrans %}If you don't have any device with you, you can access your account using backup codes.{% endblocktrans %}
your account using backup codes.{% endblocktrans %} {% blocktrans count counter=backup_tokens %}You have only one backup code remaining.{% plural %}You have {{ counter }} backup codes remaining.{% endblocktrans %}
{% blocktrans count counter=backup_tokens %}
You have only one backup code remaining.
{% plural %}
You have {{ counter }} backup codes remaining.
{% endblocktrans %}
</p> </p>
<p><a href="{% url 'two_factor:backup_tokens' %}" <p><a href="{% url 'two_factor:backup_tokens' %}"
class="sf-btn-link">{% trans "Show Codes" %}</a></p> class="sf-btn-link">{% trans "Show Codes" %}</a></p>
{% else %} {% else %}
<p class="txt-before-btn">{% blocktrans %}Two-factor authentication is not enabled for your <p class="txt-before-btn">{% blocktrans %}Two-factor authentication is not enabled for your account. Enable two-factor authentication for enhanced account security.{% endblocktrans %}</p>
account. Enable two-factor authentication for enhanced account
security.{% endblocktrans %}</p>
<p><a href="{% url 'two_factor:setup' %}" class="sf-btn-link"> <p><a href="{% url 'two_factor:setup' %}" class="sf-btn-link">
{% trans "Enable Two-Factor Authentication" %}</a> {% trans "Enable Two-Factor Authentication" %}</a>
</p> </p>

4
seahub/views/ajax.py
View File

@@ -1585,8 +1585,8 @@ def ajax_repo_change_passwd(request, repo_id):
is_owner = True if username == repo_owner else False is_owner = True if username == repo_owner else False
if not is_owner: if not is_owner:
return HttpResponse(json.dumps({ return HttpResponse(json.dumps({
'error': _('Faied to change password, you are not owner.')}), 'error': 'Permission denied'}),
status=400, content_type=content_type) status=403, content_type=content_type)
old_passwd = request.POST.get('old_passwd', '') old_passwd = request.POST.get('old_passwd', '')
new_passwd = request.POST.get('new_passwd', '') new_passwd = request.POST.get('new_passwd', '')