Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#F Custom locales #788

Merged
merged 12 commits into from
Oct 4, 2023
Merged

#F Custom locales #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fa741a5
Update strings in Localizable.string
gersonnoboa Aug 16, 2023
449e835
Update strings in call screens
gersonnoboa Aug 16, 2023
614b664
Update strings in secure conversations welcome screen
gersonnoboa Aug 16, 2023
03337d3
Replace old strings with new strings in some views
gersonnoboa Aug 21, 2023
61530b8
Replace old strings in chat, bubble, and alert functionality
gersonnoboa Aug 24, 2023
8d1cf3a
Replace old strings in remaining views
gersonnoboa Aug 28, 2023
fb5c41f
Update strings that don't need a translation layer
gersonnoboa Sep 1, 2023
6cb19cb
Internalize templated strings
gersonnoboa Sep 4, 2023
21500d9
Introduce string providing mechanism
gersonnoboa Sep 13, 2023
1a9afc8
StringProviding integration
Sep 21, 2023
7f8de8d
Get company name from custom locales
gersonnoboa Sep 22, 2023
3572038
Localization updates
Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions GliaWidgets.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,12 @@
311CAFCD29F8FAE20067B59F /* SecureConversations.TranscriptModel+CustomCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 311CAFCC29F8FAE20067B59F /* SecureConversations.TranscriptModel+CustomCard.swift */; };
313EBD552943116E008E9597 /* SecureConversations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 313EBD542943116E008E9597 /* SecureConversations.swift */; };
3142696A29FFB712003DF62E /* Interactor.Failing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3142696929FFB712003DF62E /* Interactor.Failing.swift */; };
3146C9432AB1851C0047D8CC /* LocalizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3146C9422AB1851C0047D8CC /* LocalizationTests.swift */; };
3146C9492AB18AC70047D8CC /* Localization+StringProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3146C9482AB18AC70047D8CC /* Localization+StringProviding.swift */; };
315BAB1A29ADFEBC00FF284B /* ConfirmationStyle+TitleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315BAB1929ADFEBC00FF284B /* ConfirmationStyle+TitleStyle.swift */; };
315BAB1C29ADFEC800FF284B /* ConfirmationStyle+SubtitleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315BAB1B29ADFEC800FF284B /* ConfirmationStyle+SubtitleStyle.swift */; };
315BAB1E29ADFED800FF284B /* ConfirmationStyle+CheckMessagesButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315BAB1D29ADFED800FF284B /* ConfirmationStyle+CheckMessagesButtonStyle.swift */; };
31882C9B2AA21B71009DE4BD /* Localization+Templates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31882C9A2AA21B71009DE4BD /* Localization+Templates.swift */; };
3189DD9429DEFAC600D68E9F /* SecureConversations.WelcomeViewModelSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3189DD9329DEFAC600D68E9F /* SecureConversations.WelcomeViewModelSpec.swift */; };
3189DD9629E4331200D68E9F /* SecureConversations.WelcomeViewModel.Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3189DD9529E4331200D68E9F /* SecureConversations.WelcomeViewModel.Mock.swift */; };
3197F7AD29E6A5C8008EE9F7 /* SecureConversations.FileUploadListView.Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3197F7AC29E6A5C8008EE9F7 /* SecureConversations.FileUploadListView.Mock.swift */; };
Expand All @@ -194,6 +197,7 @@
3197F7B429F7C26A008EE9F7 /* SecureConversations.ChatWithTranscriptViewModel+Hashable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3197F7B329F7C26A008EE9F7 /* SecureConversations.ChatWithTranscriptViewModel+Hashable.swift */; };
3197F7B629F7C2E5008EE9F7 /* SecureConversations.SecureChatModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3197F7B529F7C2E5008EE9F7 /* SecureConversations.SecureChatModel.swift */; };
3197F7B829F7C318008EE9F7 /* SecureConversations.CommonEngagementModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3197F7B729F7C318008EE9F7 /* SecureConversations.CommonEngagementModel.swift */; };
31B1F8A92AB093ED009EC5AD /* StringProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31B1F8A82AB093ED009EC5AD /* StringProviding.swift */; };
31D286AD2A00DD2C009192A6 /* SecureConversations.ConfirmationViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D286AC2A00DD2C009192A6 /* SecureConversations.ConfirmationViewModelTests.swift */; };
31D286AF2A00DE2B009192A6 /* SecureConversations.ConfirmationViewModel.Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D286AE2A00DE2B009192A6 /* SecureConversations.ConfirmationViewModel.Mock.swift */; };
31DB0C01287C2EFC00FB288E /* StaticValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31DB0C00287C2EFC00FB288E /* StaticValues.swift */; };
Expand Down Expand Up @@ -923,9 +927,12 @@
311CAFCC29F8FAE20067B59F /* SecureConversations.TranscriptModel+CustomCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SecureConversations.TranscriptModel+CustomCard.swift"; sourceTree = "<group>"; };
313EBD542943116E008E9597 /* SecureConversations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.swift; sourceTree = "<group>"; };
3142696929FFB712003DF62E /* Interactor.Failing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Interactor.Failing.swift; sourceTree = "<group>"; };
3146C9422AB1851C0047D8CC /* LocalizationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationTests.swift; sourceTree = "<group>"; };
3146C9482AB18AC70047D8CC /* Localization+StringProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localization+StringProviding.swift"; sourceTree = "<group>"; };
315BAB1929ADFEBC00FF284B /* ConfirmationStyle+TitleStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ConfirmationStyle+TitleStyle.swift"; sourceTree = "<group>"; };
315BAB1B29ADFEC800FF284B /* ConfirmationStyle+SubtitleStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ConfirmationStyle+SubtitleStyle.swift"; sourceTree = "<group>"; };
315BAB1D29ADFED800FF284B /* ConfirmationStyle+CheckMessagesButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ConfirmationStyle+CheckMessagesButtonStyle.swift"; sourceTree = "<group>"; };
31882C9A2AA21B71009DE4BD /* Localization+Templates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localization+Templates.swift"; sourceTree = "<group>"; };
3189DD9329DEFAC600D68E9F /* SecureConversations.WelcomeViewModelSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.WelcomeViewModelSpec.swift; sourceTree = "<group>"; };
3189DD9529E4331200D68E9F /* SecureConversations.WelcomeViewModel.Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.WelcomeViewModel.Mock.swift; sourceTree = "<group>"; };
3197F7AC29E6A5C8008EE9F7 /* SecureConversations.FileUploadListView.Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.FileUploadListView.Mock.swift; sourceTree = "<group>"; };
Expand All @@ -934,6 +941,7 @@
3197F7B329F7C26A008EE9F7 /* SecureConversations.ChatWithTranscriptViewModel+Hashable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SecureConversations.ChatWithTranscriptViewModel+Hashable.swift"; sourceTree = "<group>"; };
3197F7B529F7C2E5008EE9F7 /* SecureConversations.SecureChatModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.SecureChatModel.swift; sourceTree = "<group>"; };
3197F7B729F7C318008EE9F7 /* SecureConversations.CommonEngagementModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.CommonEngagementModel.swift; sourceTree = "<group>"; };
31B1F8A82AB093ED009EC5AD /* StringProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringProviding.swift; sourceTree = "<group>"; };
31D286AC2A00DD2C009192A6 /* SecureConversations.ConfirmationViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.ConfirmationViewModelTests.swift; sourceTree = "<group>"; };
31D286AE2A00DE2B009192A6 /* SecureConversations.ConfirmationViewModel.Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureConversations.ConfirmationViewModel.Mock.swift; sourceTree = "<group>"; };
31DB0C00287C2EFC00FB288E /* StaticValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaticValues.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1674,6 +1682,9 @@
1A205D5C25655CB1003AA3CD /* Info.plist */,
1A60AFAE256680EF00E53F53 /* L10n.swift */,
31E35AB92A8648E9006EC7FB /* Localization.swift */,
3146C9482AB18AC70047D8CC /* Localization+StringProviding.swift */,
31882C9A2AA21B71009DE4BD /* Localization+Templates.swift */,
31B1F8A82AB093ED009EC5AD /* StringProviding.swift */,
31DB0C00287C2EFC00FB288E /* StaticValues.swift */,
);
path = GliaWidgets;
Expand All @@ -1682,7 +1693,7 @@
1A205D6525655CB2003AA3CD /* GliaWidgetsTests */ = {
isa = PBXGroup;
children = (
7552DFB22A6FBC6E0093519B /* CoreSdk */,
3146C9412AB1850A0047D8CC /* Resources */,
7552DFAF2A6FB37E0093519B /* ChatMessage */,
846A5C3729D18D220049B29F /* ScreenShareHandler */,
AFEF5C7229929A73005C3D8D /* SecureConversations */,
Expand Down Expand Up @@ -2585,6 +2596,14 @@
path = ChatTranscript;
sourceTree = "<group>";
};
3146C9412AB1850A0047D8CC /* Resources */ = {
isa = PBXGroup;
children = (
3146C9422AB1851C0047D8CC /* LocalizationTests.swift */,
);
path = Resources;
sourceTree = "<group>";
};
315BAB1829ADFE9E00FF284B /* ConfirmationStyle */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2672,13 +2691,6 @@
path = ChatMessage;
sourceTree = "<group>";
};
7552DFB22A6FBC6E0093519B /* CoreSdk */ = {
isa = PBXGroup;
children = (
);
path = CoreSdk;
sourceTree = "<group>";
};
755D186329A6A4B10009F5E8 /* WelcomeStyle */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4378,6 +4390,7 @@
846A5C4029ED83C50049B29F /* CallVisualizer.Coordinator.DelegateEvent.swift in Sources */,
845876B4282AA296007AC3DF /* ButtonView.Props.Accessibility.swift in Sources */,
1A0C9AE025C9624500815406 /* ObservableValue.swift in Sources */,
31B1F8A92AB093ED009EC5AD /* StringProviding.swift in Sources */,
75940962298D3889008B173A /* MessageMetadata.swift in Sources */,
7594094D298D37E8008B173A /* Glia.Environment.Mock.swift in Sources */,
1A60AFB9256682AF00E53F53 /* FlowCoordinator.swift in Sources */,
Expand Down Expand Up @@ -4581,6 +4594,7 @@
7594093E298D376B008B173A /* RemoteConfiguration.swift in Sources */,
1AC7A7AF258786CB00567FF8 /* EngagementViewModel.swift in Sources */,
9AE9E4B327E0E60F00BFE239 /* CallViewModel.Mock.swift in Sources */,
31882C9B2AA21B71009DE4BD /* Localization+Templates.swift in Sources */,
845876A8282A94CF007AC3DF /* BooleanQuestionView.Props.Accessibility.swift in Sources */,
1A6EBB2525ADE36900EE325D /* MediaUpgradePresenter.swift in Sources */,
1AA738B925790DB400E1120F /* ActionButtonStyle.swift in Sources */,
Expand Down Expand Up @@ -4648,6 +4662,7 @@
3100EEF2293E214B00D57F71 /* SecureConversations.Coordinator.swift in Sources */,
1AA738AE2578E0D500E1120F /* ConnectAnimationView.swift in Sources */,
754CC61627E2816F005676E9 /* Survey.InputQuestionView.swift in Sources */,
3146C9492AB18AC70047D8CC /* Localization+StringProviding.swift in Sources */,
9A1992DF27D62C2E00161AAE /* ImageView.Cache.Mock.swift in Sources */,
8491AF0D2A7A9CB900CC3E72 /* Theme.VisitorChatMessageStyle.swift in Sources */,
1A2DA72D25EF9DD900032611 /* FileUpload.swift in Sources */,
Expand Down Expand Up @@ -4881,6 +4896,7 @@
84681A952A61844000DD7406 /* ChatViewModelTests+Gva.swift in Sources */,
847A7643285A1914004044D1 /* FileUploadListViewModelTests.swift in Sources */,
9A1992E727D66C7400161AAE /* UIKitBased.Failing.swift in Sources */,
3146C9432AB1851C0047D8CC /* LocalizationTests.swift in Sources */,
846A5C3929D18D400049B29F /* ScreenShareHandlerTests.swift in Sources */,
9AE05CB62805D2CB00871321 /* Interactor.Environment.Failing.swift in Sources */,
846429862A45DB4100943BD6 /* AlertViewController.Kind+Mock.swift in Sources */,
Expand Down
22 changes: 22 additions & 0 deletions GliaWidgets/Localization+StringProviding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import Foundation

extension Localization {
static func tr(
_ table: String,
_ key: String,
_ args: CVarArg...,
fallback value: String,
stringProviding: StringProviding? = Glia.sharedInstance.stringProviding,
bundleManaging: BundleManaging = .live
) -> String {
guard
let stringProviding,
let remoteString = stringProviding.getRemoteString(key)
else {
let format = bundleManaging.current().localizedString(forKey: key, value: value, table: table)
return String(format: format, locale: Locale.current, arguments: args)
}

return remoteString
}
}
14 changes: 14 additions & 0 deletions GliaWidgets/Localization+Templates.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import Foundation

extension Localization {
enum Templates {
static let percentValue = "{uploadPercentValue}%"
static let fileNameWithProgressValue = "{uploadedFileName}, {uploadPercentValue}%"
static let operatorName = "{operatorName}"
static let callDuration = "{callDuration}"
static let titleAndBadgeValue = "{buttonTitle}, {badgeValue}"
static let errorMessage = "{message}"
static let downloadWithFileState = "{downloadedFileName}, {downloadedFileState}"
static let downloadWithFileStateAndPercentValue = "{downloadedFileName}, {downloadedFileState} {downloadPercentValue}%"
}
}
Loading