From a9ddc5284b7760a7def155568fc99e61d61ba2b2 Mon Sep 17 00:00:00 2001 From: Erin Mounts Date: Thu, 19 Nov 2015 13:12:20 -0800 Subject: [PATCH] Remove redundant Base l13n of .strings file ...and fix genstrings target's build script to build into the en.lproj folder --- APCAppCore/APCAppCore.xcodeproj/project.pbxproj | 4 +--- .../Resources/Base.lproj/APCAppCore.strings | Bin 39936 -> 0 bytes 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 APCAppCore/APCAppCore/Resources/Base.lproj/APCAppCore.strings diff --git a/APCAppCore/APCAppCore.xcodeproj/project.pbxproj b/APCAppCore/APCAppCore.xcodeproj/project.pbxproj index d7821dbe..6d4a2cca 100644 --- a/APCAppCore/APCAppCore.xcodeproj/project.pbxproj +++ b/APCAppCore/APCAppCore.xcodeproj/project.pbxproj @@ -1070,7 +1070,6 @@ 80A98DE31BFD56D70060146F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/APCEmailVerify.strings; sourceTree = ""; }; 80A98DE41BFD56D70060146F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/APCProfile.strings; sourceTree = ""; }; 80A98DE51BFD56D70060146F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/APCPasscode.strings; sourceTree = ""; }; - 80A98DED1BFD60940060146F /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/APCAppCore.strings; sourceTree = ""; }; 80A98DEF1BFD60960060146F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/APCAppCore.strings; sourceTree = ""; }; 80A98DF01BFD60970060146F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/APCAppCore.strings; sourceTree = ""; }; 80A98DF11BFE69470060146F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/APCAppCore.strings; sourceTree = ""; }; @@ -3580,7 +3579,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "OUT_DIR=\"APCAppCore/Resources\"\n# don't want to conflict with app's Localizable.strings if AppCore is included in a project as a CocoaPod\nBUILT_FILE=${OUT_DIR}/Localizable.strings\nOUT_FILE=${OUT_DIR}/APCAppCore.strings\nmkdir -p ${OUT_DIR}\nfind . -name *.m | xargs genstrings -s APCLocalizedString -o ${OUT_DIR}\nrm -f ${OUT_FILE}\nmv ${BUILT_FILE} ${OUT_FILE}"; + shellScript = "OUT_DIR=\"APCAppCore/Resources/en.lproj\"\n# don't want to conflict with app's Localizable.strings if AppCore is included in a project as a CocoaPod\nBUILT_FILE=${OUT_DIR}/Localizable.strings\nOUT_FILE=${OUT_DIR}/APCAppCore.strings\nmkdir -p ${OUT_DIR}\nfind . -name *.m | xargs genstrings -s APCLocalizedString -o ${OUT_DIR}\nrm -f ${OUT_FILE}\nmv ${BUILT_FILE} ${OUT_FILE}"; }; /* End PBXShellScriptBuildPhase section */ @@ -3967,7 +3966,6 @@ 80A98DEE1BFD60940060146F /* APCAppCore.strings */ = { isa = PBXVariantGroup; children = ( - 80A98DED1BFD60940060146F /* Base */, 80A98DEF1BFD60960060146F /* fr */, 80A98DF01BFD60970060146F /* de */, 80A98DF11BFE69470060146F /* en */, diff --git a/APCAppCore/APCAppCore/Resources/Base.lproj/APCAppCore.strings b/APCAppCore/APCAppCore/Resources/Base.lproj/APCAppCore.strings deleted file mode 100644 index e308ca4bf447aac2b1518dd6be7aa58216577e2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39936 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 E0j2-zx&QzG