Skip to content

I18n fix by Tsinghua - #672

Closed
dfnjy wants to merge 6 commits into
openedx:masterfrom
dfnjy:i18nfix
Closed

I18n fix by Tsinghua#672
dfnjy wants to merge 6 commits into
openedx:masterfrom
dfnjy:i18nfix

Conversation

@dfnjy

@dfnjy dfnjy commented Aug 14, 2013

Copy link
Copy Markdown

I fixed some i18n bugs which are obvious and easiest to fix. Most of them are in HTML templates.
Including following fixes:

  1. i18n:
    cms/djangoapps/contentstore/views/assets.py
    cms/static/client_templates/course_grade_policy.html
    cms/templates/asset_index.html
    cms/templates/widgets/units.html
    common/djangoapps/student/views.py
    lms/templates/dashboard.html
    lms/templates/forgot_password_modal.html
    lms/templates/login.html
  2. i18n error:
    cms/templates/index.html
  3. over i18n:
    lms/templates/courseware/course_about.html
  4. using wrong template:
    lms/templates/registration/password_reset_complete.html
    lms/templates/registration/password_reset_confirm.html

@dfnjy dfnjy closed this Aug 14, 2013
@dfnjy dfnjy reopened this Aug 14, 2013
@dfnjy

dfnjy commented Aug 14, 2013

Copy link
Copy Markdown
Author

first commit is also mine...forgot to change the username

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

django.utils.translation.ugettext should be imported as _ and used here, so that the translation extraction code will pick up these strings to extract.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This HTML seems to be inserted directly. Import statement may course some problems...
We copied these strings to another js file to let them be picked.

@ghost ghost assigned jtauber Aug 14, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, it seems to be a mistake

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use the "format" method for string substitution

dfnjy added 2 commits August 20, 2013 08:29
Conflicts:
	cms/djangoapps/contentstore/views/assets.py
	lms/templates/registration/password_reset_complete.html
	lms/templates/registration/password_reset_confirm.html
@dfnjy

dfnjy commented Aug 20, 2013

Copy link
Copy Markdown
Author

% to format fixed

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're here, can we drop the elite "e.g." in favor of "for example" ?

@dfnjy

dfnjy commented Aug 22, 2013

Copy link
Copy Markdown
Author

"e.g." changed to "Example" ... is it OK?

@nedbat

nedbat commented Aug 22, 2013

Copy link
Copy Markdown
Contributor

@dfnjy "e.g. FooBar" should become, "for example, FooBar" or "FooBar, for example," but I didn't mean for you to correct the English, that's should be on us.

@dfnjy

dfnjy commented Aug 23, 2013

Copy link
Copy Markdown
Author

@nedbat All right. Is everything corrected now?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants