Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

20190622 1117 #6

Merged
merged 6 commits into from
Jun 24, 2019
Merged

20190622 1117 #6

merged 6 commits into from
Jun 24, 2019

Conversation

devinreams
Copy link
Contributor

This supersedes #5 and includes a few new strings as part of the 1.6.x series of development and app improvements.

@Pike based on this diff to the ios-l10n-scripts export script...

diff --git a/export-locales.sh b/export-locales.sh
index 880e0ae..fe73562 100755
--- a/export-locales.sh
+++ b/export-locales.sh
@@ -95,7 +95,7 @@ fi
 /usr/bin/perl -p -i -e "s|OpenInFocus/en.lproj/InfoPlist.strings|OpenInFocus/InfoPlist.strings|g" /tmp/en.xliff
 /usr/bin/perl -p -i -e "s|CredentialProvider/en.lproj/InfoPlist.strings|CredentialProvider/InfoPlist.strings|g" /tmp/en.xliff
 /usr/bin/perl -p -i -e "s|CredentialProvider/en.lproj/Localizable.strings|CredentialProvider/Localizable.strings|g" /tmp/en.xliff
-/usr/bin/perl -p -i -e "s|lockbox-ios/Common/Resources/en.lproj/InfoPlist.strings|lockbox-ios/Common/Resources/InfoPlist.strings|g" /tmp/en.xliff
+/usr/bin/perl -p -i -e "s|lockbox-ios/Common/Resources/Strings/en.lproj/InfoPlist.strings|lockbox-ios/Common/Resources/Strings/InfoPlist.strings|g" /tmp/en.xliff
 /usr/bin/perl -p -i -e "s|lockbox-ios/Common/Resources/Strings/en.lproj/Localizable.strings|lockbox-ios/Common/Resources/Strings/Localizable.strings|g" /tmp/en.xliff

.. I think this resulting PR is looking much better with less "surprises" around file paths (just the adding to the "Strings" directory). How's it look to you all?

@devinreams devinreams requested a review from Delphine as a code owner June 22, 2019 18:20
@devinreams devinreams mentioned this pull request Jun 22, 2019
<note>Bundle display name</note>
</trans-unit>
<trans-unit id="CFBundleName">
<source>Firefox Lockbox</source>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

With this re-inclusion it's due to the way the CFBundleName works and its tied to a bunch of things throughout the Xcode project. I tried to surgically rename it in some places but it ended up breaking things in others, sadly. I'm not clever enough to get this a) removed from the strings nor b) get it renamed in the project without breaking other assumptions elsewhere.

<trans-unit id="hwO-wS-oS4.text">
<source>Take your passwords everywhere</source>
<target>Lleva tus contraseñas a todos lados</target>
<note>Class = "UILabel"; text = "Take your passwords everywhere"; ObjectID = "hwO-wS-oS4";</note>
</trans-unit>
</body>
</file>
<file original="lockbox-ios/Common/Resources/InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
<file original="lockbox-ios/Common/Resources/Strings/InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is due to the change found/discussed at #5

Copy link

Choose a reason for hiding this comment

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

@Delphine , this change is gonna drop the localizations that currently exist for this segment, notably, this is all the removed <target>Lockwise</target> lines like https://github.com/mozilla-l10n/lockwiseios-l10n/pull/6/files#diff-5a7f14dd031edb60ff7fffcf4890f0e2L111 in the attached files.

I think that's OK, as this particular string falls back to correct English brand name anyway, but I'd like you to confirm that call.

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed it's ok   👍

@Delphine Delphine merged commit 206b7a3 into mozilla-l10n:master Jun 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants