Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
NhienLam committed Nov 9, 2023
1 parent 504b6a6 commit d1f5ee6
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions translations/en-GB.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,6 @@
<translation id="1799407952500261728">Cook Islands</translation>
<translation id="1870056762032541323">Wrong code. Try again.</translation>
<translation id="1898579907513173256">Macau</translation>
pavithrar
Any idea why these strings got removed?
nhienlam
I just checked. These got removed because they were removed from the source code (soy msg tag). Some string got modified in source code and new translations were exported, so there were some duplicated (or slightly different) translations in these files. The old translations, whose strings were removed in source code, would be removed here. Eg. Removed from source code: -2070709910567585968 (removed in cl/386349750) -1929332760123475919 -1966996824429980990 Modified: -2016421613709283485 (new 4571870355114729513) -6295157125625453859 (new 2187260952722791093) -8971555482255213064 (new 1630237004390596779 and 4877597386645466815)
nhienlam
One concern: We will manually copy these translations to github. But if there were strings that were only changed in google3 and not github (eg. cl/386349750 vs https://github.com/firebase/firebaseui-web/blob/85fbdd46847dff45afe76d9341e8c001a3394e2d/soy/strings.soy#L244), we shouldn't remove the old translations when copying over the translations to github... Before copying the translations over to github, we need to update all the strings to be the same as google3 so that the translations work.
pavithrar
that's exactly my concern, cos firebase UI web contains these strings - https://github.com/firebase/firebaseui-web/blob/85fbdd46847dff45afe76d9341e8c001a3394e2d/soy/strings.soy#L244 We can either 1) manually change this CL and revert any deletions, then copy over translations as is to github. 2) Update strings.soy in firebase UI web to match google3 and then release a new UI Web version - I think this might be a more involved change. What about we manually fix up this CL to only add things and not remove any strings? Then we just need to publish translations + update gstatic.. no need of a ui-web release right?
nhienlam
To fix b/297769205, I'm fine with option 1. But in the long run, we should update the github strings to match google3 some time in the future so that we won't need to manually revert the deletions every time we run //third_party/firebaseui_web/tools:import_translations. What about we manually fix up this CL to only add things and not remove any strings? Then we just need to publish translations + update gstatic.. no need of a ui-web release right? Even if we do option 1, we still need to do ui-web release, don't we? If we deploy gstatic (cdn), we should also release the github ui-web, right? Otherwise, gstatic will have v6.1.1 while github doesn't have v6.1.1.
pavithrar
Oct 5, 3:26 PM
Synced up offline and decided that we will submit this CL, then release on gstatic as version 6.1.1. this will show up as "https://www.gstatic.com/firebasejs/ui/6.1.1/firebase-ui-auth__fr.js" for example.. But github users of firebaseui-web wont know to pick it up.

Once we verify this gstatic version with web widgets, we will also copy over the translations to github, make password policy error changes in github and release a new uiweb version 6.1.1. This will be consistent with what is in gstatic.

TLDR - i am ok with this CL getting submitted as is.
Resolved
<translation id="1912929493041975510">The password must be at least six characters long</translation>
<translation id="1933044638365301516">Sign in with <ph name="STRING" /></translation>
<translation id="1987722456379605552">Enter the 6-digit code that we sent to <ph name="START_LINK" /><ph name="PHONE_NUMBER" /><ph name="END_LINK" /></translation>
Expand Down

0 comments on commit d1f5ee6

Please sign in to comment.