Skip to content

Tsinghuax/lms i18n - #433

Merged
adampalay merged 3 commits into
masterfrom
tsinghuax/lms-i18n
Aug 1, 2013
Merged

Tsinghuax/lms i18n#433
adampalay merged 3 commits into
masterfrom
tsinghuax/lms-i18n

Conversation

@cpennington

Copy link
Copy Markdown
Contributor

@sarina: Here's the i18n PR, and the i18n guidelines: https://edx-wiki.atlassian.net/wiki/display/ENG/I18n+coding+guidelines

@brianhw review also?

@sarina

sarina commented Jul 19, 2013

Copy link
Copy Markdown
Contributor

Lots of failing tests - try rebasing the branch and seeing if that fixes things.

Comment thread lms/envs/common.py Outdated

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.

edx-platform/conf/locale ?

@chrisndodge

Copy link
Copy Markdown
Contributor

Can I suggest this gets merged after next release candidate is made? I think we want to have enough time buffer to when this goes live.

Comment thread lms/templates/footer.html Outdated

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.

Don't translate EdX

Comment thread lms/templates/register.html Outdated

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.

We shouldn't translate lorem ipsum. What text should really go here?

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.

Can we kill the lorem? What's it even doing here?

@adampalay

Copy link
Copy Markdown
Contributor

Got the build to pass. I'm going to rebase my last few commit.

@adampalay

Copy link
Copy Markdown
Contributor

@cpennington @sarina , once the build passes?

@cpennington

Copy link
Copy Markdown
Contributor Author

👍

@sarina

sarina commented Jul 31, 2013

Copy link
Copy Markdown
Contributor

Ned left a few comments about indentation that it appears you haven't responded to - I'd ask him for his blessing as well. 👍 by me.

@adampalay

Copy link
Copy Markdown
Contributor

It's failing acceptance tests, need a moment

cpennington and others added 3 commits July 31, 2013 19:39
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
fixes template errors

keep tos untranslated

formatting fixes
@adampalay

Copy link
Copy Markdown
Contributor

Ok, acceptance tests are passing. @nedbat , do I get the a-ok?

adampalay added a commit that referenced this pull request Aug 1, 2013
@adampalay
adampalay merged commit 933935a into master Aug 1, 2013
@adampalay
adampalay deleted the tsinghuax/lms-i18n branch August 1, 2013 14:00
chrisrossi pushed a commit to jazkarta/edx-platform that referenced this pull request Mar 31, 2014
…style

Made video go to the center of the screen in full screen
e-kolpakov referenced this pull request in open-craft/openedx-platform May 15, 2015
Bumped XBlock version to include List/Dict string coercion
diegomillan pushed a commit to eduNEXT/edx-platform that referenced this pull request Sep 14, 2016
* stv/diff/imports:
  Unfork import statements
xavierchan pushed a commit to xavierchan/edx-platform-1 that referenced this pull request May 28, 2019
andrey-canon pushed a commit to eduNEXT/edx-platform that referenced this pull request Jan 19, 2021
ju/ednx/JD-1: Microsite aware key-secret pairs for oauth
MoisesGSalas pushed a commit to eduNEXT/edx-platform that referenced this pull request Jan 12, 2022
(cherry picked from commit 6bf4364)

Co-authored-by: Meysam Azad <meysam@opencraft.com>
Sujeet1379 pushed a commit to chandrudev/edx-platform that referenced this pull request Nov 17, 2022
Danyal-Faheem pushed a commit to Danyal-Faheem/edx-platform that referenced this pull request Jul 15, 2025
)

* feat: add user pref admin report

* chore: comment cleaning and standardizing admin reports name

* feat: add preferred language column in report
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.

7 participants