From 9c1dfe46cf39147ebe25a98eb0603828d4e8c61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Mon, 18 Dec 2017 09:43:26 -0800 Subject: [PATCH] [ios, macos] Cleaned up base localization files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Localizable strings in Darwin classes need to specify “Foundation” as the table so that NSBundle consults the right .strings files. Reran make genstrings to add some missing strings to the base localizations and undo some manual edits to the base localizations that contained errors. --- .../resources/Base.lproj/Foundation.strings | 6 ++++++ platform/darwin/src/MGLAttributionInfo.mm | 4 ++-- .../resources/Base.lproj/Localizable.strings | Bin 7378 -> 3962 bytes .../macos/sdk/Base.lproj/Localizable.strings | Bin 298 -> 840 bytes 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/darwin/resources/Base.lproj/Foundation.strings b/platform/darwin/resources/Base.lproj/Foundation.strings index 9d63dfa69..ba7db3fc6 100644 --- a/platform/darwin/resources/Base.lproj/Foundation.strings +++ b/platform/darwin/resources/Base.lproj/Foundation.strings @@ -289,3 +289,9 @@ /* West longitude format, short: {longitude} */ "COORD_W_SHORT" = "%@W"; +/* OpenStreetMap full name attribution */ +"OSM_FULL_NAME" = "OpenStreetMap"; + +/* OpenStreetMap short name attribution */ +"OSM_SHORT_NAME" = "OSM"; + diff --git a/platform/darwin/src/MGLAttributionInfo.mm b/platform/darwin/src/MGLAttributionInfo.mm index 29dd5229a..52a83fd18 100644 --- a/platform/darwin/src/MGLAttributionInfo.mm +++ b/platform/darwin/src/MGLAttributionInfo.mm @@ -170,8 +170,8 @@ - (NSAttributedString *)titleWithStyle:(MGLAttributionInfoStyle)style { - NSString *openStreetMap = NSLocalizedStringWithDefaultValue(@"OSM_FULL_NAME", nil, nil, @"OpenStreetMap", @"OpenStreetMap full name attribution"); - NSString *OSM = NSLocalizedStringWithDefaultValue(@"OSM_SHORT_NAME", nil, nil, @"OSM", @"OpenStreetMap short name attribution"); + NSString *openStreetMap = NSLocalizedStringWithDefaultValue(@"OSM_FULL_NAME", @"Foundation", nil, @"OpenStreetMap", @"OpenStreetMap full name attribution"); + NSString *OSM = NSLocalizedStringWithDefaultValue(@"OSM_SHORT_NAME", @"Foundation", nil, @"OSM", @"OpenStreetMap short name attribution"); NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithAttributedString:self.title]; [title removeAttribute:NSUnderlineStyleAttributeName range:NSMakeRange(0, [title.string length])]; diff --git a/platform/ios/resources/Base.lproj/Localizable.strings b/platform/ios/resources/Base.lproj/Localizable.strings index 245b122fb6471d64d3237bfe7cab0a779801d7cb..571a6bca6b0e496947a7a0a484401b1e856a2c39 100644 GIT binary patch literal 3962 zcmc&%-EPxJ7`^8yMu=(w^#@ja1zHI=aUjC6qu6Ctgk(+ZNi(W52G>*UjbI$kW4P?Il}qS&8zPB}T#tub2^kHo`h~&Fw38 z@a88X&%z*0;y$+HuCXYf6y%&8ROLgQ4}y3QM&8?it3p(r@t)2uv|&Z1tyCAx`Kl{X zIP{7urI7_X@bBOMAQfI!x^e7EifepVqITC9<;}FWT=ClXbPy$Jm=A&|O3t!dqnddm z%iPxF?#yWBgJd!d()6|$N=(2D@};Qow%~`PrqfN24cF~wKns}BN9j^D{5uD0j+k4A<#dyCLW_4n&oIbOS3%9!fBer+E;^= zQNS^Xda@K%eX@|ox+7Fm+asy%ku5Lx&T=aX<9L+ZLPskHg%PE6_7GiK2vN>?0sd;U z!UKSp#A2`G9wfcz9wEV;DBzY7a>MJ+K}18dqUMG>w3AAW##CuI4Q4@>%zUMXtb6^; z3UjnDQmC?m92w(BU<)H_f=g?k1jBq1O!HANj>6$hU7|6!N<`zWG>5K9HN-d7tmfdLUO>)Tfc9!c z_SweMrqg!^_axs54K8Ef?TtE(f{m82=gjAa5;-zyPaXf{Y1!aPDY!9`Ux;hIezu#!hw%{F;_2f- z?gup7vH!sov=T>%)h0!9=u1xG@Q>j9cDO{*fwS%+{qR5xbQw$2)4Bzqk2woRZNN=~ zXa2qIr55;^VP6R>OebBpsnX&5JPs!9!fkbkR;^|D!oxu(X_xVkAg^mkx>k^LdZDRt zG14L81wNY&gA9W60n)$S`gbI;aR)VE zm_CG`@hdEIIx9BI`#ub7xrOsOA0=n;{rAlc!N-~CC4ZqCY*>&98A;_C;^+w2ur3po zSP5s=beFGc$5uGB0Z$LjER4cQn9a^Xk(A2E9!%eQWS;AW_6km%s>b@g6fCKQ0%R~e zueONV^=U=JnhS@ci*EixD=>ZDc*bz0)q16IT{k`|o%eU91{>GyV7jZt^-_@>tHIBb6b+{4fQo`wESyxB62pGDL%uNL}$ZQLfkP2Wz$?{!w0o( z>#ptEd%8aR);-kQB$;&=wx}vL5p1%1Bl^<}oaL@V5>U~~1_@k`joY%Z1;AaE^{Uf5 z$;MfC?N12iyW~Ihpx%nlf;W`|kb(0`(@H>E{VB5}X=iCT%ZDI%@0<7(037e|lYt!m E2ZufNUH||9 literal 7378 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 literal 298 zcmbV{y9&ZU5JgX&uUJyrpM#-9~otau- jV)ipbJ9EamWP1H#yK{1LC&52-k%bgnb_0C<4PTZwtr#${