From 289e9d69b492c1861eb0df339c2d5e5ca15a5c28 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Thu, 19 Jan 2012 23:29:30 +0100 Subject: [PATCH] Internationalisation fixes. --- External/Pearl | 2 +- OnePassword.xcodeproj/project.pbxproj | 45 ++++++------------ .../MainStoryboard_iPad.storyboard | 0 .../MainStoryboard_iPhone.storyboard | 0 .../{English.lproj => en.lproj}/Root.strings | Bin 5 files changed, 16 insertions(+), 31 deletions(-) rename OnePassword/{en.lproj => }/MainStoryboard_iPad.storyboard (100%) rename OnePassword/{en.lproj => }/MainStoryboard_iPhone.storyboard (100%) rename OnePassword/Settings.bundle/{English.lproj => en.lproj}/Root.strings (100%) diff --git a/External/Pearl b/External/Pearl index c4cd94ab..65e79b56 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit c4cd94ab7743a06a0173e3a93e6ea10ab7c7d7f5 +Subproject commit 65e79b5650ad6ae6de16e6debc2b070d7b06eec1 diff --git a/OnePassword.xcodeproj/project.pbxproj b/OnePassword.xcodeproj/project.pbxproj index 11b0a415..fa3942dc 100644 --- a/OnePassword.xcodeproj/project.pbxproj +++ b/OnePassword.xcodeproj/project.pbxproj @@ -366,15 +366,15 @@ DA5BFA55147E415C00F98B1E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA5BFA53147E415C00F98B1E /* InfoPlist.strings */; }; DA5BFA57147E415C00F98B1E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5BFA56147E415C00F98B1E /* main.m */; }; DA5BFA5B147E415C00F98B1E /* OPAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5BFA5A147E415C00F98B1E /* OPAppDelegate.m */; }; - DA5BFA5E147E415C00F98B1E /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA5BFA5C147E415C00F98B1E /* MainStoryboard_iPhone.storyboard */; }; - DA5BFA61147E415C00F98B1E /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA5BFA5F147E415C00F98B1E /* MainStoryboard_iPad.storyboard */; }; DA5BFA64147E415C00F98B1E /* OnePassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA5BFA62147E415C00F98B1E /* OnePassword.xcdatamodeld */; }; DA5BFA67147E415C00F98B1E /* OPMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5BFA66147E415C00F98B1E /* OPMainViewController.m */; }; DA5DB7A614BE4B19002DD256 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5DB7A514BE4B19002DD256 /* Default.png */; }; DA5DB7A814BE4B4B002DD256 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5DB7A714BE4B4B002DD256 /* Default@2x.png */; }; DA7659AF14C5E22E00769249 /* Square-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7659AD14C5E22E00769249 /* Square-bottom.png */; }; DA7659B014C5E22E00769249 /* Square-top.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7659AE14C5E22E00769249 /* Square-top.png */; }; - DA7974C114C8C69F00A71457 /* Pearl.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAC77CD41482AAD600BCF976 /* Pearl.strings */; }; + DA7974C214C8C98500A71457 /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA7974C314C8C98500A71457 /* MainStoryboard_iPhone.storyboard */; }; + DA7974C414C8C98C00A71457 /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA7974C514C8C98C00A71457 /* MainStoryboard_iPad.storyboard */; }; + DA7974C814C8CA5000A71457 /* Pearl.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA7974C614C8CA5000A71457 /* Pearl.strings */; }; DAC6325E1486805C0075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAC63277148680700075AEA5 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; }; @@ -985,8 +985,6 @@ DA5BFA58147E415C00F98B1E /* OnePassword-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OnePassword-Prefix.pch"; sourceTree = ""; }; DA5BFA59147E415C00F98B1E /* OPAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OPAppDelegate.h; sourceTree = ""; }; DA5BFA5A147E415C00F98B1E /* OPAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OPAppDelegate.m; sourceTree = ""; }; - DA5BFA5D147E415C00F98B1E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPhone.storyboard; sourceTree = ""; }; - DA5BFA60147E415C00F98B1E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPad.storyboard; sourceTree = ""; }; DA5BFA63147E415C00F98B1E /* OnePassword.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = OnePassword.xcdatamodel; sourceTree = ""; }; DA5BFA65147E415C00F98B1E /* OPMainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OPMainViewController.h; sourceTree = ""; }; DA5BFA66147E415C00F98B1E /* OPMainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OPMainViewController.m; sourceTree = ""; }; @@ -994,6 +992,9 @@ DA5DB7A714BE4B4B002DD256 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../Default@2x.png"; sourceTree = ""; }; DA7659AD14C5E22E00769249 /* Square-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Square-bottom.png"; sourceTree = ""; }; DA7659AE14C5E22E00769249 /* Square-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Square-top.png"; sourceTree = ""; }; + DA7974C314C8C98500A71457 /* MainStoryboard_iPhone.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainStoryboard_iPhone.storyboard; sourceTree = ""; }; + DA7974C514C8C98C00A71457 /* MainStoryboard_iPad.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainStoryboard_iPad.storyboard; sourceTree = ""; }; + DA7974C714C8CA5000A71457 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Pearl.strings; sourceTree = ""; }; DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libuicolor-utilities.a"; sourceTree = BUILT_PRODUCTS_DIR; }; DAC6326C148680650075AEA5 /* libjrswizzle.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjrswizzle.a; sourceTree = BUILT_PRODUCTS_DIR; }; DAC632791486809A0075AEA5 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JRSwizzle.h; path = External/Pearl/External/jrswizzle/JRSwizzle.h; sourceTree = SOURCE_ROOT; }; @@ -1027,7 +1028,6 @@ DAC77CD01482AAD600BCF976 /* PearlStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlStrings.h; sourceTree = ""; }; DAC77CD11482AAD600BCF976 /* PearlStrings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlStrings.m; sourceTree = ""; }; DAC77CD21482AAD600BCF976 /* Resettable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resettable.h; sourceTree = ""; }; - DAC77CD51482AAD600BCF976 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Pearl.strings; sourceTree = ""; }; DAC77CD61482AAD600BCF976 /* Strings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Strings.h; sourceTree = ""; }; DAC77CD71482AAD600BCF976 /* Strings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Strings.m; sourceTree = ""; }; DAC77CD81482AAD600BCF976 /* StringUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringUtils.h; sourceTree = ""; }; @@ -2700,8 +2700,8 @@ DA7C28A214AF02A000491972 /* Models */ = { isa = PBXGroup; children = ( - DA5BFA5C147E415C00F98B1E /* MainStoryboard_iPhone.storyboard */, - DA5BFA5F147E415C00F98B1E /* MainStoryboard_iPad.storyboard */, + DA7974C314C8C98500A71457 /* MainStoryboard_iPhone.storyboard */, + DA7974C514C8C98C00A71457 /* MainStoryboard_iPad.storyboard */, DA5BFA62147E415C00F98B1E /* OnePassword.xcdatamodeld */, ); name = Models; @@ -2799,7 +2799,7 @@ DAC77CD31482AAD600BCF976 /* Resources */ = { isa = PBXGroup; children = ( - DAC77CD41482AAD600BCF976 /* Pearl.strings */, + DA7974C614C8CA5000A71457 /* Pearl.strings */, ); path = Resources; sourceTree = ""; @@ -4177,6 +4177,7 @@ knownRegions = ( en, English, + es, ); mainGroup = DA5BFA39147E415C00F98B1E; productRefGroup = DA5BFA45147E415C00F98B1E /* Products */; @@ -4197,8 +4198,8 @@ buildActionMask = 2147483647; files = ( DA5BFA55147E415C00F98B1E /* InfoPlist.strings in Resources */, - DA5BFA5E147E415C00F98B1E /* MainStoryboard_iPhone.storyboard in Resources */, - DA5BFA61147E415C00F98B1E /* MainStoryboard_iPad.storyboard in Resources */, + DA7974C214C8C98500A71457 /* MainStoryboard_iPhone.storyboard in Resources */, + DA7974C414C8C98C00A71457 /* MainStoryboard_iPad.storyboard in Resources */, DA007F5514B25EE100251337 /* ciphers.plist in Resources */, DA5DB7A614BE4B19002DD256 /* Default.png in Resources */, DA5DB7A814BE4B4B002DD256 /* Default@2x.png in Resources */, @@ -4680,7 +4681,7 @@ DA7659AF14C5E22E00769249 /* Square-bottom.png in Resources */, DA7659B014C5E22E00769249 /* Square-top.png in Resources */, DADC3C4D14C62B350091CB4D /* Settings.bundle in Resources */, - DA7974C114C8C69F00A71457 /* Pearl.strings in Resources */, + DA7974C814C8CA5000A71457 /* Pearl.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4790,26 +4791,10 @@ name = InfoPlist.strings; sourceTree = ""; }; - DA5BFA5C147E415C00F98B1E /* MainStoryboard_iPhone.storyboard */ = { + DA7974C614C8CA5000A71457 /* Pearl.strings */ = { isa = PBXVariantGroup; children = ( - DA5BFA5D147E415C00F98B1E /* en */, - ); - name = MainStoryboard_iPhone.storyboard; - sourceTree = ""; - }; - DA5BFA5F147E415C00F98B1E /* MainStoryboard_iPad.storyboard */ = { - isa = PBXVariantGroup; - children = ( - DA5BFA60147E415C00F98B1E /* en */, - ); - name = MainStoryboard_iPad.storyboard; - sourceTree = ""; - }; - DAC77CD41482AAD600BCF976 /* Pearl.strings */ = { - isa = PBXVariantGroup; - children = ( - DAC77CD51482AAD600BCF976 /* English */, + DA7974C714C8CA5000A71457 /* en */, ); name = Pearl.strings; sourceTree = ""; diff --git a/OnePassword/en.lproj/MainStoryboard_iPad.storyboard b/OnePassword/MainStoryboard_iPad.storyboard similarity index 100% rename from OnePassword/en.lproj/MainStoryboard_iPad.storyboard rename to OnePassword/MainStoryboard_iPad.storyboard diff --git a/OnePassword/en.lproj/MainStoryboard_iPhone.storyboard b/OnePassword/MainStoryboard_iPhone.storyboard similarity index 100% rename from OnePassword/en.lproj/MainStoryboard_iPhone.storyboard rename to OnePassword/MainStoryboard_iPhone.storyboard diff --git a/OnePassword/Settings.bundle/English.lproj/Root.strings b/OnePassword/Settings.bundle/en.lproj/Root.strings similarity index 100% rename from OnePassword/Settings.bundle/English.lproj/Root.strings rename to OnePassword/Settings.bundle/en.lproj/Root.strings