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

russian update, escaped quotes, %s simplification #205

Merged
merged 5 commits into from
Jun 4, 2022
Merged

russian update, escaped quotes, %s simplification #205

merged 5 commits into from
Jun 4, 2022

Conversation

marc-medley
Copy link
Member

@marc-medley marc-medley commented May 20, 2022

@slavick This PR has several updates:

  1. Russian has an upated translation. see Russian: translation daily-dozen-localization#9
  2. Resolves an issues daily-dozen-localization where the single quote should be escaped as \' when generating the strings.xml files.
    • This would affect the presentation of several translations (e.g. Italian which use lots of single quotes).
  3. The double quotes are also now escaped \" in the content.
  4. The uses of %1$s have been replaced with a simplified %s. The thinking is:
    • 1$ does not appear to be programmatically needed in the Java code.
    • %s formatter can also work in the iOS Swift code.
      • A common format allows for several translation rows to be common for the Android and Apple devices.
      • However, %1$s is not support in a Swift formatter string.
    • %s is easer than %1$s for translators to work with in the spreadsheet

string_format

@marc-medley
Copy link
Member Author

@slavick I did some additional XML detailed regression checking which resulted in commit 73ab04f.

This last commit fixed two discovered issues:

  • The about_text_lines had been missing the last line, proper vertical spacing, and some translations.
  • Consistant use of ¼ and ½ insead of 1/4 and 1/2.

The escaped quotes (\' and \") were verified to be as expected. And, the source *.tsv files were verified free of any remaining \' which would have caused a \\' in the *.xml.

So, with that, I think this pull request is ready to be put into a test build when you have time.

@marc-medley
Copy link
Member Author

@slavick And, one more thing... a minor Italian update did also get added. See: nutritionfactsorg/daily-dozen-localization#12 (comment)

@slavick slavick merged commit 13a7ea7 into nutritionfactsorg:unified-descriptions Jun 4, 2022
slavick added a commit that referenced this pull request Aug 14, 2022
* unified imperial, metric strings (removes need for %s) (#204)

see #201

* Implement change to read full serving size strings instead of building them

* russian update, escaped quotes, %s simplification  (#205)

* russian update

* xml fixes: `\\'` to `\'`, `\ N` to `\n\n`

* escaped double quotes `\"`

* fixed "about_text_lines" mapping. also some misc update (fractions)

* some Italian updates. French: l\\'application --> l\'application

* Update versionCode and versionName

* Remove redundant label

* Add try/catch for exception that has been observed

* Remove unpopular translations

* Update strings

* Change createWeightsIfDoesNotExist to return boolean (indicating weights saved) instead of the unused Weights object

* Remove unused code

* Revert "Remove unpopular translations"

This reverts commit a6b9c9c.

* Update strings

* Update versionCode

* Update Spanish translation

* Update versionCode and versionName

* Update Spanish (#206)

Co-authored-by: --marc <[email protected]>
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.

2 participants