Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4156 from edx/sarina/fix-i18n-bugs

Browse Source 
Fix variable names to give context for translators
This commit is contained in:
Sarina Canelake
2014-06-19 00:13:38 -04:00
parent d3d45b8863 30c8da1596
commit 4477c2857f
11 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/djangoapps/student/views.py
View File

@@ -1522,9 +1522,8 @@ def password_reset_confirm_wrapper(
if PasswordHistory.is_password_reset_too_soon(user):
num_days = settings.ADVANCED_SECURITY_CONFIG['MIN_TIME_IN_DAYS_BETWEEN_ALLOWED_RESETS']
err_msg = ungettext(
# Translators: If you need to use a variable number instead of the number "one", use {num} in its place.
"You are resetting passwords too frequently. Due to security policies, one day must elapse between password resets",
"You are resetting passwords too frequently. Due to security policies, {num} days must elapse between password resets",
"You are resetting passwords too frequently. Due to security policies, {num} day must elapse between password resets.",
"You are resetting passwords too frequently. Due to security policies, {num} days must elapse between password resets.",
num_days
).format(num=num_days)

2
common/static/js/src/jquery.timeago.locale.js
View File

@@ -1,5 +1,7 @@
jQuery.timeago.settings.strings = {
// Translators: %s will be a time quantity, such as "4 minutes" or "1 day"
formatAgo: gettext("%s ago"),
// Translators: %s will be a time quantity, such as "4 minutes" or "1 day"
formatFromNow: gettext("%s from now"),
seconds: gettext("less than a minute"),
minute: gettext("about a minute"),