Remap pt-BR to pt on iOS

Remap pt-BR to pt on iOS

iOS looks for Brazilian Portuguese under pt, not pt-BR. Remap the grd
output from pt-BR to pt on iOS so that it ends up in the right place.

BUG=None


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=164312

[tony, 2012-10-24 17:48:34]

LGTM, just some minor suggestions.

https://codereview.chromium.org/11276003/diff/2001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11276003/diff/2001/build/common.gypi#newcode1300
build/common.gypi:1300: 'locales': ['pt'],
Can we keep pt-BR in the list above and use in this condition, use 'locales!':
['pt-BR'], 'locales': ['pt']?  I'm not sure if that works, but we do similar
things for cflags.

https://codereview.chromium.org/11276003/diff/2001/chrome/app/chromium_string...
File chrome/app/chromium_strings.grd (right):

https://codereview.chromium.org/11276003/diff/2001/chrome/app/chromium_string...
chrome/app/chromium_strings.grd:86: <if expr="not pp_ifdef('ios')">
benrg recently added <if><then></then><else></else></if> support to grit. 
benrg, should we start using this or were you waiting until after the M24 branch
is made?

[benrg, 2012-10-24 19:00:35]

https://codereview.chromium.org/11276003/diff/2001/chrome/app/chromium_string...
File chrome/app/chromium_strings.grd (right):

https://codereview.chromium.org/11276003/diff/2001/chrome/app/chromium_string...
chrome/app/chromium_strings.grd:86: <if expr="not pp_ifdef('ios')">
On 2012/10/24 17:48:34, tony wrote:
> benrg recently added <if><then></then><else></else></if> support to grit. 
> benrg, should we start using this or were you waiting until after the M24
> branch is made?

I haven't had a chance to think about it, but also I'm not sure what changes are
needed to internal translation tools. It may be a good idea to wait until after
M24. Joi probably knows.

[Jói, 2012-10-24 19:40:12]

The internal snapshot is currently at r78.  While there is probably
time to roll it to r80 or later before the branch point, it would be
best if this change is not committed until it has been rolled.

Rolling the internal snapshot should by now be trivial, but I
discovered a bug today in GRIT (that is introduced in either r79 or
r80) that complains of duplicate IDs when the "offset" feature is
used.

To illustrate the bug, something like this would trigger it:

...
<identifiers>
  <identifier name="IDS_BASE" id="12000"/>
  <identifier name="OFFSET_ZERO" id="0"/>
</identifiers>
<messages first_id="IDS_BASE">
  <message offset="OFFSET_ZERO">Hello World!</message>
</messages>
...

So basically we need to fix that first, before we roll the internal
snapshot past r78, and then we can start using <if><then><else> stuff
in GRIT.

Cheers,
Jói


On Wed, Oct 24, 2012 at 7:00 PM,  <benrg@chromium.org> wrote:
>
>
https://codereview.chromium.org/11276003/diff/2001/chrome/app/chromium_string...
> File chrome/app/chromium_strings.grd (right):
>
>
https://codereview.chromium.org/11276003/diff/2001/chrome/app/chromium_string...
> chrome/app/chromium_strings.grd:86: <if expr="not pp_ifdef('ios')">
> On 2012/10/24 17:48:34, tony wrote:
>>
>> benrg recently added <if><then></then><else></else></if> support to
>
> grit.
>>
>> benrg, should we start using this or were you waiting until after the
>
> M24
>>
>> branch is made?
>
>
> I haven't had a chance to think about it, but also I'm not sure what
> changes are needed to internal translation tools. It may be a good idea
> to wait until after M24. Joi probably knows.
>
> https://codereview.chromium.org/11276003/

[tony, 2012-10-24 20:13:37]

Ok, sounds like we should just use the existing <if></if> support for this
change.  We can switch to if/then/else later.

[stuartmorgan, 2012-10-25 04:43:22]

https://codereview.chromium.org/11276003/diff/2001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11276003/diff/2001/build/common.gypi#newcode1300
build/common.gypi:1300: 'locales': ['pt'],
On 2012/10/24 17:48:34, tony wrote:
> Can we keep pt-BR in the list above and use in this condition, use 'locales!':
> ['pt-BR'], 'locales': ['pt']?  I'm not sure if that works, but we do similar
> things for cflags.

That was the first thing I tried, and it didn't work. I'm pretty sure it's just
an order-of-resolution problem, but I didn't want to move the locale change too
far away from where all the other grit settings are to fix it (e.g., by putting
it in target_conditionals).

I'll make another pass at seeing if I can persuade it to work that way though,
since I agree it would be nicer not to have to disrupt the main list for this.

[stuartmorgan, 2012-10-25 06:21:56]

+thakis for OWNERS

https://codereview.chromium.org/11276003/diff/2001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11276003/diff/2001/build/common.gypi#newcode1300
build/common.gypi:1300: 'locales': ['pt'],
Turns out filters (!, /) just don't apply to variables, so 'pt-BR' will have to
stay as-is.

[Jói, 2012-10-25 10:53:05]

> Ok, sounds like we should just use the existing <if></if> support for this
> change.  We can switch to if/then/else later.

Agreed, it is simplest if we hold off on using <if><then><else> syntax
until after the M24 branch point.

Cheers,
Jói


On Wed, Oct 24, 2012 at 8:13 PM,  <tony@chromium.org> wrote:
> Ok, sounds like we should just use the existing <if></if> support for this
> change.  We can switch to if/then/else later.
>
> https://codereview.chromium.org/11276003/

[Nico, 2012-10-26 01:11:03]

lgtm stamp given that tony looked at this

https://codereview.chromium.org/11276003/diff/2002/chrome/app/chromium_string...
File chrome/app/chromium_strings.grd (right):

https://codereview.chromium.org/11276003/diff/2002/chrome/app/chromium_string...
chrome/app/chromium_strings.grd:84: <output filename="chromium_strings_pt.pak"
type="data_package" lang="pt-BR" />
the lang= attribute is intentionally pt-BR here?

[stuartmorgan, 2012-10-26 04:33:57]

https://codereview.chromium.org/11276003/diff/2002/chrome/app/chromium_string...
File chrome/app/chromium_strings.grd (right):

https://codereview.chromium.org/11276003/diff/2002/chrome/app/chromium_string...
chrome/app/chromium_strings.grd:84: <output filename="chromium_strings_pt.pak"
type="data_package" lang="pt-BR" />
On 2012/10/26 01:11:03, Nico wrote:
> the lang= attribute is intentionally pt-BR here?

Yep, see Norwegian above.

[commit-bot: I haz the power, 2012-10-26 04:35:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stuartmorgan@chromium.org/11276003/2002

[commit-bot: I haz the power, 2012-10-26 10:50:49]

Change committed as 164312