Skip to content

Translation overrides - #1355

Closed
shawone wants to merge 8 commits into
openedx:masterfrom
shawone:translation-overrides
Closed

Translation overrides#1355
shawone wants to merge 8 commits into
openedx:masterfrom
shawone:translation-overrides

Conversation

@shawone

@shawone shawone commented Oct 15, 2013

Copy link
Copy Markdown
Contributor

Usefull variables for transifex translation

Szczork Szczork
Translation overrides
9d9dac7 
Usefull variables for translation
@singingwolfboy

singingwolfboy commented Oct 17, 2013

Copy link
Copy Markdown
Contributor

Thanks, this looks great! However, before we can merge it, we need you to sign and submit the individual contributor agreement, as stated in the CONTRIBUTING file. Can you submit it, and let me know when you've done so?

@jtauber

jtauber commented Oct 18, 2013

Copy link
Copy Markdown
Contributor

contributor agreement received

@singingwolfboy

singingwolfboy commented Oct 18, 2013

Copy link
Copy Markdown
Contributor

@e0d or @feanil, can one of you two review this? @Szczork, can you also add yourself to the AUTHORS file in the repository?

feanil
feanil reviewed Oct 18, 2013
View reviewed changes
Comment thread lms/envs/aws.py Outdated

@feanil feanil Oct 18, 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.

There should be a default for LANGUAGES in lms/envs/common.py and that should be referenced here instead of setting the default here.

@e0d

e0d commented Oct 18, 2013

Copy link
Copy Markdown
Contributor

I'd like to see them separated from the existing TZ variables.

Also, could you make the same changes to cms/envs/aws.py and common.py, see @feanil 's line comment.

@shawone

shawone commented Oct 19, 2013

Copy link
Copy Markdown
Contributor Author

Thanks, I have just added a new commit.

feanil
feanil reviewed Oct 19, 2013
View reviewed changes
Comment thread lms/envs/aws.py Outdated

@feanil feanil Oct 19, 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.

Please update this to have default set to 'LANGUAGES'
i.e.

LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES)

@shawone shawone Oct 19, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@feanil: Ok I have updated.

@feanil

feanil commented Oct 19, 2013

Copy link
Copy Markdown
Contributor

lgtm.

@singingwolfboy singingwolfboy mentioned this pull request Oct 23, 2013
Merged
@singingwolfboy

singingwolfboy commented Oct 23, 2013

Copy link
Copy Markdown
Contributor

@Szczork I squashed your commits into one commit, rebased it onto master, created a new pull request (#1465), and merged it. Your code is in! ✨

jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Oct 27, 2016
@hachiyanagi-ks
Change english for paid course openedx#1346 (openedx#1355)
468f3eb 
* Change english for paid course openedx#1346

* Change english for activate message openedx#1346
john2x pushed a commit to open-craft/openedx-platform that referenced this pull request Jan 31, 2019
@viadanna
Revert openedx#1351 MCKIN-7757/bump completion (openedx#1355)
22b6b04 
* Revert "version bump for scorm xblock (openedx#1354)"

This reverts commit d465dc3.

* Revert "Bump completion to v0.1.15 (openedx#1351)"

This reverts commit 58932f3.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@shawone @singingwolfboy @jtauber @e0d @feanil @jarv