haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-10 19:32:25 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1980 from haiwen/6.2-trans

Browse Source 
[i18n] Update source string
This commit is contained in:
xiez 2018-01-15 18:11:10 +08:00 committed by GitHub
commit bfc72301b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 751 additions and 829 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

100
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: 2017-12-19 15:54+0800\n" "POT-Creation-Date: 2018-01-12 18:04+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"
@ -18,12 +18,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: static/scripts/app/models/deleted-repo.js:19 #: static/scripts/app/models/deleted-repo.js:19
#: static/scripts/app/models/repo.js:59 static/scripts/common.js:319 #: static/scripts/app/models/repo.js:59 static/scripts/common.js:320
msgid "Encrypted library" msgid "Encrypted library"
msgstr "" msgstr ""
#: static/scripts/app/models/deleted-repo.js:21 #: static/scripts/app/models/deleted-repo.js:21
#: static/scripts/app/models/repo.js:61 static/scripts/common.js:323 #: static/scripts/app/models/repo.js:61 static/scripts/common.js:324
#: static/scripts/sysadmin-app/models/trash-repo.js:14 #: static/scripts/sysadmin-app/models/trash-repo.js:14
msgid "Read-Write library" msgid "Read-Write library"
msgstr "" msgstr ""
@ -33,7 +33,7 @@ msgstr ""
#: static/scripts/app/views/fileupload.js:378 #: static/scripts/app/views/fileupload.js:378
#: static/scripts/app/views/fileupload.js:392 #: static/scripts/app/views/fileupload.js:392
#: static/scripts/app/views/fileupload.js:404 #: static/scripts/app/views/fileupload.js:404
#: static/scripts/app/views/fileupload.js:416 static/scripts/common.js:586 #: static/scripts/app/views/fileupload.js:416 static/scripts/common.js:598
msgid "Just now" msgid "Just now"
msgstr "" msgstr ""
@ -64,7 +64,7 @@ msgstr ""
msgid "Passwords don't match" msgid "Passwords don't match"
msgstr "" msgstr ""
#: static/scripts/app/models/repo.js:63 static/scripts/common.js:321 #: static/scripts/app/models/repo.js:63 static/scripts/common.js:322
msgid "Read-Only library" msgid "Read-Only library"
msgstr "" msgstr ""
@ -92,7 +92,7 @@ msgstr ""
#: static/scripts/app/views/group.js:110 static/scripts/app/views/group.js:143 #: static/scripts/app/views/group.js:110 static/scripts/app/views/group.js:143
#: static/scripts/app/views/groups.js:83 #: static/scripts/app/views/groups.js:83
#: static/scripts/app/views/groups.js:134 #: static/scripts/app/views/groups.js:134
#: static/scripts/app/views/invitations.js:78 #: static/scripts/app/views/invitations.js:119
#: static/scripts/app/views/my-deleted-repos.js:86 #: static/scripts/app/views/my-deleted-repos.js:86
#: static/scripts/app/views/myhome-repos.js:104 #: static/scripts/app/views/myhome-repos.js:104
#: static/scripts/app/views/myhome-shared-repos.js:81 #: static/scripts/app/views/myhome-shared-repos.js:81
@ -150,8 +150,8 @@ msgstr ""
#: static/scripts/app/views/dialogs/repo-folder-perm-admin.js:302 #: static/scripts/app/views/dialogs/repo-folder-perm-admin.js:302
#: static/scripts/app/views/dialogs/repo-history-settings.js:83 #: static/scripts/app/views/dialogs/repo-history-settings.js:83
#: static/scripts/app/views/dialogs/repo-history-settings.js:142 #: static/scripts/app/views/dialogs/repo-history-settings.js:142
#: static/scripts/app/views/dir.js:1292 static/scripts/app/views/dir.js:1326 #: static/scripts/app/views/dir.js:1291 static/scripts/app/views/dir.js:1325
#: static/scripts/app/views/dir.js:1395 #: static/scripts/app/views/dir.js:1394
#: static/scripts/app/views/dirent-details.js:164 #: static/scripts/app/views/dirent-details.js:164
#: static/scripts/app/views/dirent-grid.js:338 #: static/scripts/app/views/dirent-grid.js:338
#: static/scripts/app/views/dirent-grid.js:379 #: static/scripts/app/views/dirent-grid.js:379
@ -174,14 +174,14 @@ msgstr ""
#: static/scripts/app/views/group-settings.js:287 #: static/scripts/app/views/group-settings.js:287
#: static/scripts/app/views/group-settings.js:327 #: static/scripts/app/views/group-settings.js:327
#: static/scripts/app/views/group-settings.js:362 #: static/scripts/app/views/group-settings.js:362
#: static/scripts/app/views/invitations.js:146 #: static/scripts/app/views/invitations.js:188
#: static/scripts/app/views/repo-folder-perm-item.js:86 #: static/scripts/app/views/repo-folder-perm-item.js:86
#: static/scripts/app/views/repo-folder-perm-item.js:127 #: static/scripts/app/views/repo-folder-perm-item.js:127
#: static/scripts/app/views/repo.js:206 static/scripts/app/views/repo.js:281 #: static/scripts/app/views/repo.js:206 static/scripts/app/views/repo.js:281
#: static/scripts/app/views/repo.js:398 static/scripts/app/views/repo.js:440 #: static/scripts/app/views/repo.js:398 static/scripts/app/views/repo.js:440
#: static/scripts/app/views/share.js:423 static/scripts/app/views/share.js:808 #: static/scripts/app/views/share.js:423 static/scripts/app/views/share.js:808
#: static/scripts/app/views/share.js:887 static/scripts/common.js:407 #: static/scripts/app/views/share.js:887 static/scripts/common.js:419
#: static/scripts/common.js:496 #: static/scripts/common.js:508
#: static/scripts/sysadmin-app/views/admin-login-logs.js:129 #: static/scripts/sysadmin-app/views/admin-login-logs.js:129
#: static/scripts/sysadmin-app/views/admin-operation-logs.js:129 #: static/scripts/sysadmin-app/views/admin-operation-logs.js:129
#: static/scripts/sysadmin-app/views/dashboard.js:84 #: static/scripts/sysadmin-app/views/dashboard.js:84
@ -256,7 +256,7 @@ msgstr ""
#: static/scripts/app/views/dialogs/dirent-mvcp.js:132 #: static/scripts/app/views/dialogs/dirent-mvcp.js:132
#: static/scripts/app/views/dialogs/dirent-mvcp.js:163 #: static/scripts/app/views/dialogs/dirent-mvcp.js:163
#: static/scripts/app/views/dir.js:1386 #: static/scripts/app/views/dir.js:1385
msgid "Canceled." msgid "Canceled."
msgstr "" msgstr ""
@ -286,7 +286,7 @@ msgstr ""
#: static/scripts/app/views/dir.js:622 static/scripts/app/views/dir.js:683 #: static/scripts/app/views/dir.js:622 static/scripts/app/views/dir.js:683
#: static/scripts/app/views/dirent.js:477 #: static/scripts/app/views/dirent.js:477
#: static/scripts/app/views/groups.js:112 #: static/scripts/app/views/groups.js:112
#: static/scripts/app/views/invitations.js:54 #: static/scripts/app/views/invitations.js:58
#: static/scripts/app/views/repo.js:175 static/scripts/app/views/repo.js:411 #: static/scripts/app/views/repo.js:175 static/scripts/app/views/repo.js:411
#: static/scripts/sysadmin-app/views/device-trusted-ipaddresses.js:42 #: static/scripts/sysadmin-app/views/device-trusted-ipaddresses.js:42
#: static/scripts/sysadmin-app/views/dir.js:82 #: static/scripts/sysadmin-app/views/dir.js:82
@ -352,7 +352,7 @@ msgstr ""
#: static/scripts/app/views/group-manage-members.js:112 #: static/scripts/app/views/group-manage-members.js:112
#: static/scripts/app/views/group-members.js:75 #: static/scripts/app/views/group-members.js:75
#: static/scripts/app/views/group.js:138 static/scripts/app/views/groups.js:78 #: static/scripts/app/views/group.js:138 static/scripts/app/views/groups.js:78
#: static/scripts/app/views/invitations.js:141 #: static/scripts/app/views/invitations.js:183
#: static/scripts/app/views/my-deleted-repos.js:81 #: static/scripts/app/views/my-deleted-repos.js:81
#: static/scripts/app/views/myhome-repos.js:99 #: static/scripts/app/views/myhome-repos.js:99
#: static/scripts/app/views/myhome-shared-repos.js:76 #: static/scripts/app/views/myhome-shared-repos.js:76
@ -506,64 +506,64 @@ msgstr ""
msgid "Copy selected item(s) to:" msgid "Copy selected item(s) to:"
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1179 static/scripts/app/views/dir.js:1347 #: static/scripts/app/views/dir.js:1179 static/scripts/app/views/dir.js:1346
msgid "Successfully moved %(name)s." msgid "Successfully moved %(name)s."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1181 static/scripts/app/views/dir.js:1349 #: static/scripts/app/views/dir.js:1181 static/scripts/app/views/dir.js:1348
msgid "Successfully moved %(name)s and 1 other item." msgid "Successfully moved %(name)s and 1 other item."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1183 static/scripts/app/views/dir.js:1351 #: static/scripts/app/views/dir.js:1183 static/scripts/app/views/dir.js:1350
msgid "Successfully moved %(name)s and %(amount)s other items." msgid "Successfully moved %(name)s and %(amount)s other items."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1188 static/scripts/app/views/dir.js:1355 #: static/scripts/app/views/dir.js:1188 static/scripts/app/views/dir.js:1354
msgid "Successfully copied %(name)s." msgid "Successfully copied %(name)s."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1190 static/scripts/app/views/dir.js:1357 #: static/scripts/app/views/dir.js:1190 static/scripts/app/views/dir.js:1356
msgid "Successfully copied %(name)s and 1 other item." msgid "Successfully copied %(name)s and 1 other item."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1192 static/scripts/app/views/dir.js:1359 #: static/scripts/app/views/dir.js:1192 static/scripts/app/views/dir.js:1358
msgid "Successfully copied %(name)s and %(amount)s other items." msgid "Successfully copied %(name)s and %(amount)s other items."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1204 #: static/scripts/app/views/dir.js:1203
msgid "Internal error. Failed to move %(name)s and %(amount)s other item(s)." msgid "Internal error. Failed to move %(name)s and %(amount)s other item(s)."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1206 #: static/scripts/app/views/dir.js:1205
msgid "Internal error. Failed to move %(name)s." msgid "Internal error. Failed to move %(name)s."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1210 #: static/scripts/app/views/dir.js:1209
msgid "Internal error. Failed to copy %(name)s and %(amount)s other item(s)." msgid "Internal error. Failed to copy %(name)s and %(amount)s other item(s)."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1212 #: static/scripts/app/views/dir.js:1211
msgid "Internal error. Failed to copy %(name)s." msgid "Internal error. Failed to copy %(name)s."
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1254 #: static/scripts/app/views/dir.js:1253
msgid "Moving file %(index)s of %(total)s" msgid "Moving file %(index)s of %(total)s"
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1254 #: static/scripts/app/views/dir.js:1253
msgid "Copying file %(index)s of %(total)s" msgid "Copying file %(index)s of %(total)s"
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1280 #: static/scripts/app/views/dir.js:1279
msgid "Failed to move %(name)s" msgid "Failed to move %(name)s"
msgstr "" msgstr ""
#: static/scripts/app/views/dir.js:1280 #: static/scripts/app/views/dir.js:1279
msgid "Failed to copy %(name)s" msgid "Failed to copy %(name)s"
msgstr "" msgstr ""
#: static/scripts/app/views/dirent-details.js:99 static/scripts/common.js:629 #: static/scripts/app/views/dirent-details.js:99 static/scripts/common.js:641
#: static/scripts/common.js:700 #: static/scripts/common.js:712
msgid "No matches" msgid "No matches"
msgstr "" msgstr ""
@ -745,11 +745,17 @@ msgid "Are you sure you want to quit this group?"
msgstr "" msgstr ""
#: static/scripts/app/views/invitation.js:37 #: static/scripts/app/views/invitation.js:37
#: static/scripts/app/views/share-admin-folder.js:91 #: static/scripts/sysadmin-app/views/device-trusted-ipaddress.js:39
#: static/scripts/app/views/share-admin-repo.js:99 #: static/scripts/sysadmin-app/views/group.js:44
#: static/scripts/app/views/share-admin-share-link.js:55 msgid "Successfully deleted 1 item."
#: static/scripts/app/views/share-admin-upload-link.js:54 msgstr ""
msgid "Successfully deleted 1 item"
#: static/scripts/app/views/invitations.js:94
msgid "Successfully invited %(email)."
msgstr ""
#: static/scripts/app/views/invitations.js:97
msgid "Successfully invited %(email) and %(num) other people."
msgstr "" msgstr ""
#: static/scripts/app/views/notifications.js:58 #: static/scripts/app/views/notifications.js:58
@ -804,6 +810,13 @@ msgstr ""
msgid "Successfully modified permission" msgid "Successfully modified permission"
msgstr "" msgstr ""
#: static/scripts/app/views/share-admin-folder.js:91
#: static/scripts/app/views/share-admin-repo.js:99
#: static/scripts/app/views/share-admin-share-link.js:55
#: static/scripts/app/views/share-admin-upload-link.js:54
msgid "Successfully deleted 1 item"
msgstr ""
#: static/scripts/app/views/share.js:67 #: static/scripts/app/views/share.js:67
#: static/scripts/sysadmin-app/views/share.js:41 #: static/scripts/sysadmin-app/views/share.js:41
msgid "Share {placeholder}" msgid "Share {placeholder}"
@ -859,27 +872,27 @@ msgstr ""
msgid "Successfully unstared {placeholder}" msgid "Successfully unstared {placeholder}"
msgstr "" msgstr ""
#: static/scripts/common.js:620 #: static/scripts/common.js:632
msgid "Search users or enter emails and press Enter" msgid "Search users or enter emails and press Enter"
msgstr "" msgstr ""
#: static/scripts/common.js:628 static/scripts/common.js:699 #: static/scripts/common.js:640 static/scripts/common.js:711
msgid "Please enter 1 or more character" msgid "Please enter 1 or more character"
msgstr "" msgstr ""
#: static/scripts/common.js:630 static/scripts/common.js:701 #: static/scripts/common.js:642 static/scripts/common.js:713
msgid "Searching..." msgid "Searching..."
msgstr "" msgstr ""
#: static/scripts/common.js:631 static/scripts/common.js:702 #: static/scripts/common.js:643 static/scripts/common.js:714
msgid "Loading failed" msgid "Loading failed"
msgstr "" msgstr ""
#: static/scripts/common.js:691 #: static/scripts/common.js:703
msgid "Search groups" msgid "Search groups"
msgstr "" msgstr ""
#: static/scripts/common.js:1026 #: static/scripts/common.js:1038
msgid "Packaging..." msgid "Packaging..."
msgstr "" msgstr ""
@ -948,11 +961,6 @@ msgstr ""
msgid "Successfully clean all errors." msgid "Successfully clean all errors."
msgstr "" msgstr ""
#: static/scripts/sysadmin-app/views/device-trusted-ipaddress.js:39
#: static/scripts/sysadmin-app/views/group.js:44
msgid "Successfully deleted 1 item."
msgstr ""
#: static/scripts/sysadmin-app/views/group-member.js:81 #: static/scripts/sysadmin-app/views/group-member.js:81
msgid "Delete Member" msgid "Delete Member"
msgstr "" msgstr ""

7
seahub/notifications/models.py
View File

@ -723,9 +723,12 @@ class UserNotification(models.Model):
self.delete() self.delete()
return return
msg = _('Guest %(user)s accepted your <a href="%(href)s">invitation</a> at %(time)s.') % { # Use same msg as in notice_email.html, so there will be only one msg
# in django.po.
msg = _('Guest %(user)s accepted your <a href="%(url_base)s%(inv_url)s">invitation</a> at %(time)s.') % {
'user': inv.accepter, 'user': inv.accepter,
'href': settings.SITE_ROOT + '#invitations/', 'url_base': '',
'inv_url': settings.SITE_ROOT + '#invitations/',
'time': inv.accept_time.strftime("%Y-%m-%d %H:%M:%S"), 'time': inv.accept_time.strftime("%Y-%m-%d %H:%M:%S"),
} }
return msg return msg

0
seahub/templates/registration/register_complete_email.txt → seahub/templates/registration/register_complete_email.html
View File

0
seahub/templates/registration/register_complete_email_subject.txt → seahub/templates/registration/register_complete_email_subject.html
View File

4
thirdpart/registration/models.py
View File

@ -334,12 +334,12 @@ def notify_admins_on_register_complete(reg_email):
"reg_email": reg_email, "reg_email": reg_email,
} }
subject = render_to_string('registration/register_complete_email_subject.txt', subject = render_to_string('registration/register_complete_email_subject.html',
ctx_dict) ctx_dict)
# Email subject *must not* contain newlines # Email subject *must not* contain newlines
subject = ''.join(subject.splitlines()) subject = ''.join(subject.splitlines())
message = render_to_string('registration/register_complete_email.txt', message = render_to_string('registration/register_complete_email.html',
ctx_dict) ctx_dict)
admins = User.objects.get_superusers() admins = User.objects.get_superusers()