Skip to content

Cleanup translation PR #778

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

Merged
merged 27 commits into from
Jul 17, 2017
Merged

Cleanup translation PR #778

merged 27 commits into from
Jul 17, 2017

Conversation

SUPERCILEX
Copy link
Collaborator

@samtstern There were too many things to review on #771 so I made a PR, hope you don't mind! 😄

Changelog:

  • Remove trailing whitespace
  • Fix lint issues regarding using ellipses and curved quote characters (We use the special characters in English so we should do the same for other languages)
  • Undo unnecessary changes (there were some weird changes in vectors and layouts that didn't need to be there)

ashwinraghav and others added 8 commits June 21, 2017 14:17
Change-Id: Iee013581f6d1e7e7387c06ce3895c378f03a6b23
Change-Id: Iaea384e3957470181d802a702d7f1a6feffea124
Change-Id: Ibeec6996cfc24d59366cfcb94297ce9007c73b9f
Change-Id: I2495679d27e4342946ad1744004639dc1bf43cb3
Change-Id: Ie45aa4e35e5078e8f6b08c1015f4b075c54f0f2f
@SUPERCILEX
Copy link
Collaborator Author

Oh and I forgot to mention that the build is going to fail because I didn't change the preamble stuff since that's in a state of flux at the moment.

@samtstern
Copy link
Contributor

Thanks for doing this @SUPERCILEX. For the ellipses/curved quote characters did you use a script for this? The issue is that we're going to get the bad characters back every time I import the strings files from our translation service so I'd like to have a one-click way to remove them again (that's why I am checking in scripts in the original PR)

@SUPERCILEX
Copy link
Collaborator Author

@samtstern Oh lol, I just did a find and replace in Intellij. However, I see how writing a script makes sense so I'm trying to write one, but I keep getting python charmap errors with your remove_non_translatable script. Are you using Python 2 or 3? (I installed 3)

@samtstern
Copy link
Contributor

@SUPERCILEX I am using Python 2.7, I'm sure there's some way to make the script specify that but my Python fu is not that strong.

@SUPERCILEX
Copy link
Collaborator Author

@samtstern Haha, thanks! 😄

@SUPERCILEX
Copy link
Collaborator Author

@samtstern Well that was fun, haven't used Python is ages! 😄 I wrote and used the scripts to process the new translations, but there are still some missing so the build will fail:
image

Is that unexpected or should I disable the lint warning?

PS: please squash this PR, I made some merge mistakes and my script ended up being added to the merge commit which is gross so I gave up on the other commits. Sorry about that! 😆

… into translations

Change-Id: I6b3c7b6c30e4fb699eabd4e1cd019edf84046b4a
@samtstern
Copy link
Contributor

@SUPERCILEX yeah you're right we're still missing a few translations, I thought they had all come in but I guess they have not. So let's leave the lint warning.

Happy to squash this PR once we don't have conflicts. You may want to save yourself some pain and wait until I have 100% of the translations put into the main PR so that you only have to resolve conflicts one more time. Should be today or tomorrow.

Change-Id: I530e90a032b58211ba6ee85595f7c43a0f499bdb
Change-Id: Ibb8a5b10395127e428ce21b9cd27fbd8535ed9a2
@SUPERCILEX
Copy link
Collaborator Author

@samtstern Cool beans! 😄 Can you tell me when all the translations have been imported? Thanks!

@samtstern
Copy link
Contributor

@SUPERCILEX definitely, will do

samtstern and others added 4 commits June 28, 2017 13:21
Change-Id: I2a91ae6a2a8d8950713aafa2391c16e4afc1fbcd
…s-cleanup

# Conflicts:
#	auth/src/main/res/values-ar/strings.xml
#	auth/src/main/res/values-bn/strings.xml
#	auth/src/main/res/values-gu/strings.xml
#	auth/src/main/res/values-hi/strings.xml
#	auth/src/main/res/values-hr/strings.xml
#	auth/src/main/res/values-mr/strings.xml
#	auth/src/main/res/values-ms/strings.xml
#	auth/src/main/res/values-sl/strings.xml
#	auth/src/main/res/values-ta/strings.xml
#	auth/src/main/res/values-tl/strings.xml
#	auth/src/main/res/values-uk/strings.xml
#	auth/src/main/res/values-ur/strings.xml
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
@SUPERCILEX
Copy link
Collaborator Author

@samtstern Merged! We're all ready to go! 😄

@samtstern
Copy link
Contributor

@SUPERCILEX I am going to merge translations soon (as soon as the build turns green). Let's do your PR against 2.1.0-dev after that. Hope you don't mind! I think that's a bit cleaner.

@SUPERCILEX
Copy link
Collaborator Author

@samtstern SGTM! Can you wait until Monday to release v2.1? I won't have access to a proper workstation until then so I won't be able to attend to my PRs.

@samtstern
Copy link
Contributor

@SUPERCILEX no problem, wasn't planning on releasing today anyway.

…ations-cleanup

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	auth/src/main/res/values-b+es+419/strings.xml
#	auth/src/main/res/values-bg/strings.xml
#	auth/src/main/res/values-bn/strings.xml
#	auth/src/main/res/values-ca/strings.xml
#	auth/src/main/res/values-cs/strings.xml
#	auth/src/main/res/values-da/strings.xml
#	auth/src/main/res/values-de-rAT/strings.xml
#	auth/src/main/res/values-de-rCH/strings.xml
#	auth/src/main/res/values-de/strings.xml
#	auth/src/main/res/values-el/strings.xml
#	auth/src/main/res/values-en-rAU/strings.xml
#	auth/src/main/res/values-en-rCA/strings.xml
#	auth/src/main/res/values-en-rGB/strings.xml
#	auth/src/main/res/values-en-rIE/strings.xml
#	auth/src/main/res/values-en-rIN/strings.xml
#	auth/src/main/res/values-en-rSG/strings.xml
#	auth/src/main/res/values-en-rZA/strings.xml
#	auth/src/main/res/values-es-rAR/strings.xml
#	auth/src/main/res/values-es-rBO/strings.xml
#	auth/src/main/res/values-es-rCL/strings.xml
#	auth/src/main/res/values-es-rCO/strings.xml
#	auth/src/main/res/values-es-rCR/strings.xml
#	auth/src/main/res/values-es-rDO/strings.xml
#	auth/src/main/res/values-es-rEC/strings.xml
#	auth/src/main/res/values-es-rGT/strings.xml
#	auth/src/main/res/values-es-rHN/strings.xml
#	auth/src/main/res/values-es-rMX/strings.xml
#	auth/src/main/res/values-es-rNI/strings.xml
#	auth/src/main/res/values-es-rPA/strings.xml
#	auth/src/main/res/values-es-rPE/strings.xml
#	auth/src/main/res/values-es-rPR/strings.xml
#	auth/src/main/res/values-es-rPY/strings.xml
#	auth/src/main/res/values-es-rSV/strings.xml
#	auth/src/main/res/values-es-rUS/strings.xml
#	auth/src/main/res/values-es-rUY/strings.xml
#	auth/src/main/res/values-es-rVE/strings.xml
#	auth/src/main/res/values-es/strings.xml
#	auth/src/main/res/values-fa/strings.xml
#	auth/src/main/res/values-fi/strings.xml
#	auth/src/main/res/values-fil/strings.xml
#	auth/src/main/res/values-fr-rCH/strings.xml
#	auth/src/main/res/values-fr/strings.xml
#	auth/src/main/res/values-gsw/strings.xml
#	auth/src/main/res/values-gu/strings.xml
#	auth/src/main/res/values-hi/strings.xml
#	auth/src/main/res/values-hr/strings.xml
#	auth/src/main/res/values-hu/strings.xml
#	auth/src/main/res/values-in/strings.xml
#	auth/src/main/res/values-it/strings.xml
#	auth/src/main/res/values-ja/strings.xml
#	auth/src/main/res/values-kn/strings.xml
#	auth/src/main/res/values-ko/strings.xml
#	auth/src/main/res/values-ln/strings.xml
#	auth/src/main/res/values-lt/strings.xml
#	auth/src/main/res/values-lv/strings.xml
#	auth/src/main/res/values-mo/strings.xml
#	auth/src/main/res/values-mr/strings.xml
#	auth/src/main/res/values-ms/strings.xml
#	auth/src/main/res/values-nb/strings.xml
#	auth/src/main/res/values-nl/strings.xml
#	auth/src/main/res/values-no/strings.xml
#	auth/src/main/res/values-pl/strings.xml
#	auth/src/main/res/values-pt-rBR/strings.xml
#	auth/src/main/res/values-pt-rPT/strings.xml
#	auth/src/main/res/values-pt/strings.xml
#	auth/src/main/res/values-ro/strings.xml
#	auth/src/main/res/values-ru/strings.xml
#	auth/src/main/res/values-sk/strings.xml
#	auth/src/main/res/values-sl/strings.xml
#	auth/src/main/res/values-sr/strings.xml
#	auth/src/main/res/values-sv/strings.xml
#	auth/src/main/res/values-ta/strings.xml
#	auth/src/main/res/values-th/strings.xml
#	auth/src/main/res/values-tl/strings.xml
#	auth/src/main/res/values-tr/strings.xml
#	auth/src/main/res/values-uk/strings.xml
#	auth/src/main/res/values-ur/strings.xml
#	auth/src/main/res/values-vi/strings.xml
#	auth/src/main/res/values-zh-rCN/strings.xml
#	auth/src/main/res/values-zh-rHK/strings.xml
#	auth/src/main/res/values-zh-rTW/strings.xml
#	auth/src/main/res/values-zh/strings.xml
#	library/src/main/AndroidManifest.xml
#	scripts/translations/base_string_script.py
#	scripts/translations/clean_up_translations.sh
#	scripts/translations/remove_non_translatable.py
#	scripts/translations/remove_string.py
Signed-off-by: Alex Saveau <[email protected]>
@SUPERCILEX SUPERCILEX changed the base branch from translations to version-2.1.0-dev July 17, 2017 00:15
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
@SUPERCILEX
Copy link
Collaborator Author

@samtstern All merged up and ready to roll!

@@ -10,8 +10,8 @@

class BaseStringScript:

def ProcessTag(self, lines):
return lines
def ProcessTag(self, line):
Copy link
Contributor

Choose a reason for hiding this comment

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

Rename doesn't bother me but just FYI this is an array of multiple lines in the case where the <string> tag occupies more than one line in the XML file.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@samtstern oh, got it. Yeah, I was confused when writing my script because I thought it was all lines of the whole file. I see what you meant now—either way, #namingishard 😂

@samtstern samtstern merged commit 90a5f3b into firebase:version-2.1.0-dev Jul 17, 2017
@samtstern
Copy link
Contributor

@SUPERCILEX thanks for all the merge insanity.

@SUPERCILEX SUPERCILEX deleted the translations-cleanup branch July 18, 2017 00:13
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.

3 participants