Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localization Upgrades #691

Merged
merged 32 commits into from May 20, 2016
Merged

Localization Upgrades #691

merged 32 commits into from May 20, 2016

Conversation

goehle
Copy link
Member

@goehle goehle commented Mar 31, 2016

  • Created a script update_localization_files which will update webwork2.pot and all of the po files. In theory we can ask any developer making a pull request to run this. That will keep our language files a little more up to date.
  • Changed all mentions of "due date" to "close date" and mentions of sets being "due" to sets "closing" as per Change "Due Date" to "Close Date" #685
  • Added maketext calls to many new things. So many maketext calls...
  • Added a dummy utility function x which can be wrapped around strings and leaves them unchanged. This is for when the string is defined as a constant (and $r->maketext) isnt present. The constant can be fed to maketext for translation and the x function around the string definition allows xgettext.pl to scrape it for the pot file.
  • Minor Changes:
  • Added "xXx" to the maketext definitions to help with debugging. This is a temporary change and should be reverted before the pull is merged.
  • Deleted some blocks of code that had been commented out for a long time.

To test: Check out this branch, as well as the corresponding PG branch (openwebwork/pg#273) The entire interface basically needs a once over. Each page (that we still support) should be visited and interacted with. Things to look for:

  1. The functionality of the page should be unchanged.
  2. All non-user generated strings should be wrapped in "xXx" to indicate that they have been run through maketext. (Including transient strings like notifications and messages.)
  3. All mentions of due date should be close date

If you find missing maketext strings you can post about it here and I will fix them, or you can make a pull request to the localize branch on my github and I will pull those changes there.

In some ways this pull request is not completely done. The template pot file has been updated to include a ton of new strings and all of the po files are very out of date. Keeping the translations current, though is likely to be an ongoing project. So if you know someone who is bilingual and likes WeBWorK let them know.

Edit: We are managing the actual translation of the pot file at https://www.transifex.com/webwork/webwork2/ You should direct people here if they are interested in doing translation for WeBWorK.

@goehle goehle changed the title Localize Localization Upgrades Apr 3, 2016
@goehle
Copy link
Member Author

goehle commented May 18, 2016

Fixed conflicts with develop.

…o localize

Conflicts:
	conf/defaults.config
	lib/WeBWorK/ContentGenerator.pm
	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail2.pm
	lib/WeBWorK/ContentGenerator/ProblemSets.pm
	lib/WeBWorK/URLPath.pm
@mgage
Copy link
Sponsor Member

mgage commented May 19, 2016

Hi Goeff. The localization pull request now has conflicts probably because there were some maketext changes in the earlier achievements PR. It's probably best if you compare the 5 files that have simultaneous changes and make choices. I'd probably get the choices right but there is a chance that I wouldn't understand which is the right one.

I'll check and pull the localization PR as soon as you have the conflicts resolved.

@goehle
Copy link
Member Author

goehle commented May 19, 2016

Conflicts resolved. I also updated the po files to include strings added by #686

…o localize

Conflicts:
	lib/WeBWorK/AchievementEvaluator.pm
	lib/WeBWorK/AchievementItems.pm
	lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
	lib/WeBWorK/Localize.pm
@mgage
Copy link
Sponsor Member

mgage commented May 19, 2016

The edit button on the course info and problem set info (problem header ) pages blends in with the background instead of standing out in white. --- this might be because the xXx brackets are interfering with the style sheets or the javaScript

@goehle
Copy link
Member Author

goehle commented May 19, 2016

It is because of the xXx. The xXx will be removed before this is pulled
and the edit button should go back to normal.

On Thu, May 19, 2016 at 4:27 PM, Michael Gage notifications@github.com
wrote:

The edit button on the course info and problem set info (problem header )
pages blends in with the background instead of standing out in white. ---
this might be because the xXx brackets are interfering with the style
sheets or the javaScript


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#691 (comment)

@mgage
Copy link
Sponsor Member

mgage commented May 20, 2016

what else needs to be done here? Is this ready to pull?

@goehle
Copy link
Member Author

goehle commented May 20, 2016

I would need to remove the xXx brackets before we pull. Another possibility is to solicit feedback from various translators. It would be a good time for them to take a look at the pot file (I put the latest one on Transifex) to see if any of the strings need to be reworked.

@goehle
Copy link
Member Author

goehle commented May 20, 2016

xXx debugs removed.

@goehle
Copy link
Member Author

goehle commented May 20, 2016

On second thought lets pull this. There are changes in a lot of files and there is more chance that we will generate conflicts with feature branches the longer this sits around.

@mgage
Copy link
Sponsor Member

mgage commented May 20, 2016

I agree.

@mgage mgage merged commit 9eaa85b into openwebwork:develop May 20, 2016
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.

None yet

2 participants