Skip to content

Commit

Permalink
Migrate to String Catalog (#178)
Browse files Browse the repository at this point in the history 
* refractor: Migration to String Catalog

* perf: Relocate Localizable.xcstrings under Easydict/App folder
  • Loading branch information
@Jerry23011
Jerry23011 authored Sep 24, 2023
1 parent e5ce77d commit 4ac786a
Show file tree
Hide file tree
Showing 7 changed files with 4,966 additions and 1,318 deletions.
46 changes: 23 additions & 23 deletions Easydict.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 55;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -51,7 +51,6 @@
036196772A000F5900806370 /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 036196742A000F5900806370 /* NSData+CommonCrypto.m */; };
0361967B2A0037F700806370 /* NSData+EZMD5.m in Sources */ = {isa = PBXBuildFile; fileRef = 0361967A2A0037F700806370 /* NSData+EZMD5.m */; };
036E7D7B293F4FC8002675DF /* EZOpenLinkButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 036E7D7A293F4FC8002675DF /* EZOpenLinkButton.m */; };
0376AB5C294F659700E2E2A4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0376AB5E294F659700E2E2A4 /* Localizable.strings */; };
037852B02957FEB200D0E2CF /* EZServiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 037852AF2957FEB200D0E2CF /* EZServiceViewController.m */; };
037852B329583F5200D0E2CF /* EZServiceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 037852B229583F5200D0E2CF /* EZServiceCell.m */; };
037852B629588EDE00D0E2CF /* EZCustomTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 037852B529588EDE00D0E2CF /* EZCustomTableRowView.m */; };
Expand Down Expand Up @@ -206,6 +205,7 @@
6295DE342A84EF76006145F4 /* EZBingLookupModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295DE332A84EF76006145F4 /* EZBingLookupModel.m */; };
62A2D03F2A82967F007EEB01 /* EZBingRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 62A2D03E2A82967F007EEB01 /* EZBingRequest.m */; };
B87AC7E36367075BA5D13234 /* Pods_Easydict.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6372B33DFF803C7096A82250 /* Pods_Easydict.framework */; };
C4DE3D6D2AC00EB500C2B85D /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = C4DE3D6C2AC00EB500C2B85D /* Localizable.xcstrings */; };
C98CAE75239F4619005F7DCA /* EasydictHelper.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = C90BE309239F38EB00ADE88B /* EasydictHelper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -310,8 +310,6 @@
0361967A2A0037F700806370 /* NSData+EZMD5.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+EZMD5.m"; sourceTree = "<group>"; };
036E7D79293F4FC8002675DF /* EZOpenLinkButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZOpenLinkButton.h; sourceTree = "<group>"; };
036E7D7A293F4FC8002675DF /* EZOpenLinkButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EZOpenLinkButton.m; sourceTree = "<group>"; };
0376AB5D294F659700E2E2A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
0376AB5F294F659800E2E2A4 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
037852AE2957FEB200D0E2CF /* EZServiceViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZServiceViewController.h; sourceTree = "<group>"; };
037852AF2957FEB200D0E2CF /* EZServiceViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EZServiceViewController.m; sourceTree = "<group>"; };
037852B129583F5200D0E2CF /* EZServiceCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZServiceCell.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -343,8 +341,6 @@
03882F8A29D95044005B5A52 /* CTView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTView.h; sourceTree = "<group>"; };
03882F8B29D95044005B5A52 /* CoolToast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoolToast.h; sourceTree = "<group>"; };
03882F8C29D95044005B5A52 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
038D20392A09364B0005D000 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
038D203B2A09364D0005D000 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
0396D60F292C932F006A11D9 /* EZSelectLanguageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZSelectLanguageCell.h; sourceTree = "<group>"; };
0396D610292C932F006A11D9 /* EZSelectLanguageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EZSelectLanguageCell.m; sourceTree = "<group>"; };
0396D613292CC4C3006A11D9 /* EZLocalStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZLocalStorage.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -610,6 +606,8 @@
62A2D03E2A82967F007EEB01 /* EZBingRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EZBingRequest.m; sourceTree = "<group>"; };
6372B33DFF803C7096A82250 /* Pods_Easydict.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Easydict.framework; sourceTree = BUILT_PRODUCTS_DIR; };
91E3E579C6DB88658B4BB102 /* Pods-Easydict.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Easydict.release.xcconfig"; path = "Target Support Files/Pods-Easydict/Pods-Easydict.release.xcconfig"; sourceTree = "<group>"; };
C4DE3D6C2AC00EB500C2B85D /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = Localizable.xcstrings; path = Easydict/App/Localizable.xcstrings; sourceTree = SOURCE_ROOT; };
C4DE3D6E2AC00EB500C2B85D /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/Main.xcstrings; sourceTree = "<group>"; };
C90BE309239F38EB00ADE88B /* EasydictHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EasydictHelper.app; sourceTree = BUILT_PRODUCTS_DIR; };
C99EEB182385796700FEE666 /* Easydict-Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Easydict-Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -867,7 +865,7 @@
isa = PBXGroup;
children = (
03D1C8772952B1CD00F2C7BD /* GoogleService-Info.plist */,
0376AB5E294F659700E2E2A4 /* Localizable.strings */,
C4DE3D6C2AC00EB500C2B85D /* Localizable.xcstrings */,
03BFBB5429235C9400C48725 /* Icons */,
03B0221F29231FA6001C7E63 /* Main.storyboard */,
03B0221D29231FA6001C7E63 /* Assets.xcassets */,
Expand Down Expand Up @@ -1758,6 +1756,13 @@
path = Pods;
sourceTree = "<group>";
};
C4A40A9B2AC0168400B8E6EF /* Recovered References */ = {
isa = PBXGroup;
children = (
);
name = "Recovered References";
sourceTree = "<group>";
};
C99EEB0F2385796700FEE666 = {
isa = PBXGroup;
children = (
Expand All @@ -1766,6 +1771,7 @@
C99EEB192385796700FEE666 /* Products */,
9CB57B9B45EC322A11ED8865 /* Pods */,
713A345D86B5BC86D158B68F /* Frameworks */,
C4A40A9B2AC0168400B8E6EF /* Recovered References */,
);
sourceTree = "<group>";
usesTabs = 0;
Expand Down Expand Up @@ -1895,7 +1901,7 @@
03B022E629231FA6001C7E63 /* Assets.xcassets in Resources */,
03D1C8782952B1CD00F2C7BD /* GoogleService-Info.plist in Resources */,
03D2A3DF29F42B290035CED4 /* bd.js in Resources */,
0376AB5C294F659700E2E2A4 /* Localizable.strings in Resources */,
C4DE3D6D2AC00EB500C2B85D /* Localizable.xcstrings in Resources */,
03BFBB662923998300C48725 /* [email protected] in Resources */,
03BFBB812923A2FA00C48725 /* [email protected] in Resources */,
03BFBB7D2923A1D900C48725 /* [email protected] in Resources */,
Expand Down Expand Up @@ -2137,15 +2143,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
0376AB5E294F659700E2E2A4 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
0376AB5D294F659700E2E2A4 /* en */,
0376AB5F294F659800E2E2A4 /* zh-Hans */,
);
name = Localizable.strings;
sourceTree = SOURCE_ROOT;
};
03839140292FBE120009828C /* Main.strings */ = {
isa = PBXVariantGroup;
children = (
Expand All @@ -2166,8 +2163,7 @@
isa = PBXVariantGroup;
children = (
03B0222029231FA6001C7E63 /* Base */,
038D20392A09364B0005D000 /* zh-Hans */,
038D203B2A09364D0005D000 /* en */,
C4DE3D6E2AC00EB500C2B85D /* mul */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -2187,7 +2183,7 @@
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = MMPZK5TNQP;
DEVELOPMENT_TEAM = A2GWC68K8V;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = EasydictHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -2213,7 +2209,7 @@
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = MMPZK5TNQP;
DEVELOPMENT_TEAM = A2GWC68K8V;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = EasydictHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -2283,6 +2279,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -2340,6 +2337,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
Expand All @@ -2364,7 +2362,7 @@
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = MMPZK5TNQP;
DEVELOPMENT_TEAM = A2GWC68K8V;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PREFIX_HEADER = "$(SRCROOT)/Easydict/App/PrefixHeader.pch";
Expand All @@ -2379,6 +2377,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.izual.Easydict-debug";
PRODUCT_MODULE_NAME = Easydict;
PRODUCT_NAME = "Easydict-Debug";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Easydict/App/Easydict-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -2401,7 +2400,7 @@
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = MMPZK5TNQP;
DEVELOPMENT_TEAM = A2GWC68K8V;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PREFIX_HEADER = "$(SRCROOT)/Easydict/App/PrefixHeader.pch";
Expand All @@ -2416,6 +2415,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.izual.Easydict;
PRODUCT_MODULE_NAME = Easydict;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Easydict/App/Easydict-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
Expand Down
Loading

0 comments on commit 4ac786a

Please sign in to comment.