Skip to content

Commit cd67dda

Browse files
author
xianing
committed
fix mac localization issues
1 parent aad49ba commit cd67dda

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

‎macOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
033A9FF5252EB5F400BC26E1 /* JoinMultiChannel.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9FF7252EB5F400BC26E1 /* JoinMultiChannel.storyboard */; };
4444
033A9FFA252EB5FD00BC26E1 /* ScreenShare.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9FFC252EB5FD00BC26E1 /* ScreenShare.storyboard */; };
4545
033A9FFF252EB60800BC26E1 /* StreamEncryption.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033AA001252EB60800BC26E1 /* StreamEncryption.storyboard */; };
46-
033AA005252EBBEC00BC26E1 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 033AA004252EBBEC00BC26E1 /* Localizable.strings */; };
4746
034C626425257EA600296ECF /* GlobalSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C626325257EA600296ECF /* GlobalSettings.swift */; };
4847
034C62672525857200296ECF /* JoinChannelAudio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C62662525857200296ECF /* JoinChannelAudio.swift */; };
4948
034C626C25259FC200296ECF /* JoinChannelVideo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C626B25259FC200296ECF /* JoinChannelVideo.swift */; };
@@ -88,6 +87,7 @@
8887
57AF397B259B31AA00601E02 /* RawAudioData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57AF397A259B31AA00601E02 /* RawAudioData.swift */; };
8988
57AF3981259B329B00601E02 /* RawAudioData.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57AF3980259B329B00601E02 /* RawAudioData.storyboard */; };
9089
596A9F79AF0CD8DC1CA93253 /* Pods_APIExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */; };
90+
8B6F4EAD276ECC370097E67E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8B6F4EAF276ECC370097E67E /* Localizable.strings */; };
9191
8B733B8C267B1C0B00CC3DE3 /* bg.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 8B733B8B267B1C0B00CC3DE3 /* bg.jpg */; };
9292
EBDD0209B272C276B21B6270 /* Pods_APIExample_APIExampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC2BAB0AC82140B7CEEA31DA /* Pods_APIExample_APIExampleUITests.framework */; };
9393
/* End PBXBuildFile section */
@@ -173,7 +173,6 @@
173173
033A9FFB252EB5FD00BC26E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ScreenShare.storyboard; sourceTree = "<group>"; };
174174
033AA000252EB60800BC26E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/StreamEncryption.storyboard; sourceTree = "<group>"; };
175175
033AA003252EB60B00BC26E1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/StreamEncryption.strings"; sourceTree = "<group>"; };
176-
033AA004252EBBEC00BC26E1 /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
177176
034C626325257EA600296ECF /* GlobalSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalSettings.swift; sourceTree = "<group>"; };
178177
034C62662525857200296ECF /* JoinChannelAudio.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinChannelAudio.swift; sourceTree = "<group>"; };
179178
034C626B25259FC200296ECF /* JoinChannelVideo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinChannelVideo.swift; sourceTree = "<group>"; };
@@ -230,6 +229,7 @@
230229
57AF3980259B329B00601E02 /* RawAudioData.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = RawAudioData.storyboard; sourceTree = "<group>"; };
231230
6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_APIExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
232231
84C863718A380DFD36ABF19F /* Pods-APIExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample.debug.xcconfig"; path = "Target Support Files/Pods-APIExample/Pods-APIExample.debug.xcconfig"; sourceTree = "<group>"; };
232+
8B6F4EAE276ECC370097E67E /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
233233
8B733B8B267B1C0B00CC3DE3 /* bg.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = bg.jpg; sourceTree = "<group>"; };
234234
B53F41CB5AC550EA43C47363 /* Pods-APIExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-APIExampleTests/Pods-APIExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
235235
B91A67063F1DBE9F621B114C /* Pods-APIExample-APIExampleUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample-APIExampleUITests.release.xcconfig"; path = "Target Support Files/Pods-APIExample-APIExampleUITests/Pods-APIExample-APIExampleUITests.release.xcconfig"; sourceTree = "<group>"; };
@@ -520,7 +520,7 @@
520520
03896D2E24F8A00F008593CD /* APIExample */ = {
521521
isa = PBXGroup;
522522
children = (
523-
033AA004252EBBEC00BC26E1 /* Localizable.strings */,
523+
8B6F4EAF276ECC370097E67E /* Localizable.strings */,
524524
034C629D25297ABB00296ECF /* Resources */,
525525
03267E262500C779004A91A6 /* APIExample-Bridging-Header.h */,
526526
0333E63824FA335C0063C5B0 /* Examples */,
@@ -777,7 +777,7 @@
777777
033A9FFA252EB5FD00BC26E1 /* ScreenShare.storyboard in Resources */,
778778
57645A03259B1C22007B1E30 /* CreateDataStream.strings in Resources */,
779779
5770E2D5258C9E6F00812A80 /* Picker.xib in Resources */,
780-
033AA005252EBBEC00BC26E1 /* Localizable.strings in Resources */,
780+
8B6F4EAD276ECC370097E67E /* Localizable.strings in Resources */,
781781
57887A67258856B7006E962A /* Settings.storyboard in Resources */,
782782
033A9FFF252EB60800BC26E1 /* StreamEncryption.storyboard in Resources */,
783783
0301D31D2507C0F300DF3BEA /* MetalVideoView.xib in Resources */,
@@ -1182,6 +1182,14 @@
11821182
name = Settings.storyboard;
11831183
sourceTree = "<group>";
11841184
};
1185+
8B6F4EAF276ECC370097E67E /* Localizable.strings */ = {
1186+
isa = PBXVariantGroup;
1187+
children = (
1188+
8B6F4EAE276ECC370097E67E /* zh-Hans */,
1189+
);
1190+
name = Localizable.strings;
1191+
sourceTree = "<group>";
1192+
};
11851193
/* End PBXVariantGroup section */
11861194

11871195
/* Begin XCBuildConfiguration section */
@@ -1306,10 +1314,10 @@
13061314
buildSettings = {
13071315
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13081316
CODE_SIGN_ENTITLEMENTS = APIExample/APIExample.entitlements;
1309-
CODE_SIGN_IDENTITY = "Developer ID Application";
1310-
CODE_SIGN_STYLE = Manual;
1317+
CODE_SIGN_IDENTITY = "Apple Development";
1318+
CODE_SIGN_STYLE = Automatic;
13111319
COMBINE_HIDPI_IMAGES = YES;
1312-
DEVELOPMENT_TEAM = GM72UGLGZW;
1320+
DEVELOPMENT_TEAM = YS397FG5PA;
13131321
ENABLE_HARDENED_RUNTIME = YES;
13141322
FRAMEWORK_SEARCH_PATHS = (
13151323
"$(inherited)",
@@ -1322,7 +1330,7 @@
13221330
);
13231331
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.example.APIExample;
13241332
PRODUCT_NAME = "$(TARGET_NAME)";
1325-
PROVISIONING_PROFILE_SPECIFIER = apiexamplemac;
1333+
PROVISIONING_PROFILE_SPECIFIER = "";
13261334
SWIFT_OBJC_BRIDGING_HEADER = "APIExample/APIExample-Bridging-Header.h";
13271335
SWIFT_VERSION = 5.0;
13281336
};
@@ -1334,10 +1342,10 @@
13341342
buildSettings = {
13351343
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13361344
CODE_SIGN_ENTITLEMENTS = APIExample/APIExample.entitlements;
1337-
CODE_SIGN_IDENTITY = "Developer ID Application";
1338-
CODE_SIGN_STYLE = Manual;
1345+
CODE_SIGN_IDENTITY = "Apple Development";
1346+
CODE_SIGN_STYLE = Automatic;
13391347
COMBINE_HIDPI_IMAGES = YES;
1340-
DEVELOPMENT_TEAM = GM72UGLGZW;
1348+
DEVELOPMENT_TEAM = YS397FG5PA;
13411349
ENABLE_HARDENED_RUNTIME = YES;
13421350
FRAMEWORK_SEARCH_PATHS = (
13431351
"$(inherited)",
@@ -1350,7 +1358,7 @@
13501358
);
13511359
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.example.APIExample;
13521360
PRODUCT_NAME = "$(TARGET_NAME)";
1353-
PROVISIONING_PROFILE_SPECIFIER = apiexamplemac;
1361+
PROVISIONING_PROFILE_SPECIFIER = "";
13541362
SWIFT_OBJC_BRIDGING_HEADER = "APIExample/APIExample-Bridging-Header.h";
13551363
SWIFT_VERSION = 5.0;
13561364
};

macOS/APIExample/Localizable.strings renamed to macOS/APIExample/zh-Hans.lproj/Localizable.strings

File renamed without changes.

‎macOS/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ target 'APIExample' do
77

88
# Pods for APIExample
99
pod 'AGEVideoLayout', '~> 1.0.2'
10-
pod 'AgoraRtcEngine_macOS', '3.5.2'
10+
pod 'AgoraRtcEngine_macOS', '3.6.0.1'
1111

1212
target 'APIExampleTests' do
1313
inherit! :search_paths

0 commit comments

Comments
 (0)