Skip to content

Conversation

@PYushchenko
Copy link
Contributor

Some i18n in different modules displayed to student.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you pull the tags out of the string, or add a translator's note alerting the translator not to translate the tag?

@adampalay
Copy link
Contributor

@man2life , also, we don't want anything in common/templates or common/static to be dependent on django, so until we decide how we're going to go about translating the string there, don't worry about translating them.

@adampalay
Copy link
Contributor

@man2life , any updates on this PR?

@PYushchenko
Copy link
Contributor Author

@adampalay
Also i could remove from comit changes related to
common/templates/hinter_display.html
common/djangoapps/django_comment_common/models.py

@adampalay
Copy link
Contributor

@man2life, just for common/templates/hinter_display.html-- the djangoapps in common will still have dependencies

@sarina
Copy link
Contributor

sarina commented Nov 6, 2013

Something I've noticed in many of the common/templates & common/static files is comments around lines that will require i18n in the future - this would be a nice addition (since you've already identified them) to make short work of translating once we figure out a plan for these files.

@singingwolfboy
Copy link
Contributor

@man2life Looks like this pull request has conflicts, and needs to be rebased onto the latest master to resolve them. Do you know how to do that?

@sarina
Copy link
Contributor

sarina commented Nov 15, 2013

Still this PR will need to be rebased to resolve conflicts! Sorry :( but can you do so, so that we can get moving on merging more open source PRs? Thanks 😄

The tab names are not being translated
@sarina
Copy link
Contributor

sarina commented Nov 22, 2013

Hi,

is work on this pull request going to resume? If so please just put a comment in this PR (you can comment on the PR!) saying this is still active work. If I don't hear from you, however, we'll move to close this PR. You can re-open it when you resume work on this branch.

Thanks!

@PYushchenko
Copy link
Contributor Author

rebased and squashed

singingwolfboy and others added 2 commits November 26, 2013 07:28
Update course_navigation.html #os
Restful api for course advanced settings
@sarina
Copy link
Contributor

sarina commented Nov 26, 2013

Erp. Just found out you can't see that it can't be automatically merged.

At any rate, from my end, it says that there are still conflicts.

@singingwolfboy singingwolfboy mentioned this pull request Nov 26, 2013
Changed unit identifier to be readonly, not disabled
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this file? Did you mean to add it to your pull request?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Strange i fixed it before.

fixes

reset i18n of non-django template

Some more i18n and fix in discussion
@sarina
Copy link
Contributor

sarina commented Dec 6, 2013

Hi,

This PR can't be merged because it failed tests, and it needs a rebase.

@sarina
Copy link
Contributor

sarina commented Dec 6, 2013

@andy-armstrong or @singingwolfboy could you guys please try to get this PR merged in? I don't know what else it might need.

@singingwolfboy
Copy link
Contributor

I'm going to close this PR -- we're trying to get the changes reviewed in two separate pull requests (#1792 and #1793). Sorry this is taking forever!

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.

8 participants