keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

plurals and fix some strings

Browse Source
pull/1023/head
Ryan ZHAO 8 months ago
parent 770a770e8c
commit 5ee048330b
21 changed files with 221546 additions and 65340 deletions
Show Stats Download Patch File Download Diff File

2
Session/Closed Groups/EditClosedGroupVC.swift
Unescape Escape View File

@ -495,7 +495,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
case .finished: popToConversationVC(self) case .finished: popToConversationVC(self)
case .failure(let error): case .failure(let error):
self?.showError( self?.showError(
title: "GROUP_UPDATE_ERROR_TITLE".localized(), title: "deleteAfterLegacyGroupsGroupUpdateErrorTitle".localized(),
message: error.localizedDescription message: error.localizedDescription
) )
} }

2
Session/Closed Groups/NewClosedGroupVC.swift
Unescape Escape View File

@ -328,7 +328,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
return showError(title: "groupAddMemberMaximum".localized()) return showError(title: "groupAddMemberMaximum".localized())
} }
let selectedContacts = self.selectedContacts let selectedContacts = self.selectedContacts
let message: String? = (selectedContacts.count > 20 ? "GROUP_CREATION_PLEASE_WAIT".localized() : nil) let message: String? = (selectedContacts.count > 20 ? "deleteAfterLegacyGroupsGroupCreation".localized() : nil)
ModalActivityIndicatorViewController.present(fromViewController: navigationController!, message: message) { [weak self] _ in ModalActivityIndicatorViewController.present(fromViewController: navigationController!, message: message) { [weak self] _ in
MessageSender MessageSender
.createClosedGroup(name: name, members: selectedContacts) .createClosedGroup(name: name, members: selectedContacts)

2
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -904,7 +904,7 @@ extension ConversationVC:
.localized() .localized()
} }
}() }()
let modalConfirmTitle: String = messageDisappearingConfig.isEnabled ? "set".localized() : "CONFIRM_BUTTON_TITLE".localized() let modalConfirmTitle: String = messageDisappearingConfig.isEnabled ? "set".localized() : "confirm".localized()
let confirmationModal: ConfirmationModal = ConfirmationModal( let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info( info: ConfirmationModal.Info(
title: "disappearingMessagesFollowSetting".localized(), title: "disappearingMessagesFollowSetting".localized(),

4
Session/Conversations/Views & Modals/ConversationTitleView.swift
Unescape Escape View File

@ -198,7 +198,7 @@ final class ConversationTitleView: UIView {
labelInfos.append( labelInfos.append(
SessionLabelCarouselView.LabelInfo( SessionLabelCarouselView.LabelInfo(
attributedText: "members" attributedText: "members"
.put(key: "count", value: userCount) .putNumber(userCount)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize)), .localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize)),
accessibility: nil, // TODO: Add accessibility accessibility: nil, // TODO: Add accessibility
type: .userCount type: .userCount
@ -209,7 +209,7 @@ final class ConversationTitleView: UIView {
labelInfos.append( labelInfos.append(
SessionLabelCarouselView.LabelInfo( SessionLabelCarouselView.LabelInfo(
attributedText: "membersActive" attributedText: "membersActive"
.put(key: "count", value: userCount) .putNumber(userCount)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize)), .localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize)),
accessibility: nil, // TODO: Add accessibility accessibility: nil, // TODO: Add accessibility
type: .userCount type: .userCount

11
Session/Conversations/Views & Modals/ReactionListSheet.swift
Unescape Escape View File

@ -591,13 +591,10 @@ extension ReactionListSheet {
} }
func update(moreReactorCount: Int, emoji: String) { func update(moreReactorCount: Int, emoji: String) {
label.text = (moreReactorCount == 1 ? label.text = "emojiReactsCountOthers"
String(format: "EMOJI_REACTS_MORE_REACTORS_ONE".localized(), "\(emoji)") : .putNumber(moreReactorCount)
"emojiReactsCountOthers" .put(key: "emoji", value: emoji)
.put(key: "count", value: moreReactorCount) .localized()
.put(key: "emoji", value: emoji)
.localized()
)
} }
} }
} }

2
Session/Home/HomeVC.swift
Unescape Escape View File

@ -50,7 +50,7 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
private lazy var seedReminderView: SeedReminderView = { private lazy var seedReminderView: SeedReminderView = {
let result = SeedReminderView() let result = SeedReminderView()
result.accessibilityLabel = "Recovery phrase reminder" result.accessibilityLabel = "Recovery phrase reminder"
result.title = NSAttributedString(string: "recoveryPasswordBannerTittle".localized()) result.title = NSAttributedString(string: "recoveryPasswordBannerTitle".localized())
result.subtitle = "recoveryPasswordBannerDescription".localized() result.subtitle = "recoveryPasswordBannerDescription".localized()
result.setProgress(1, animated: false) result.setProgress(1, animated: false)
result.delegate = self result.delegate = self

2
Session/Home/New Conversation/NewMessageScreen.swift
Unescape Escape View File

@ -148,7 +148,7 @@ struct EnterAccountIdScreen: View {
) )
) { ) {
ZStack { ZStack {
Text("\("messageNewDescription".localized())\(Image(systemName: "questionmark.circle"))") Text("\("messageNewDescriptionMobile".localized())\(Image(systemName: "questionmark.circle"))")
.font(.system(size: Values.verySmallFontSize)) .font(.system(size: Values.verySmallFontSize))
.foregroundColor(themeColor: .textSecondary) .foregroundColor(themeColor: .textSecondary)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)

2
Session/Meta/Translations/InfoPlist.xcstrings
View File

File diff suppressed because one or more lines are too long

286752
Session/Meta/Translations/Localizable.xcstrings
View File

File diff suppressed because it is too large Load Diff

8
Session/Notifications/AppNotifications.swift
Unescape Escape View File

@ -153,7 +153,9 @@ public class NotificationPresenter: NotificationsProtocol {
} }
switch previewType { switch previewType {
case .noNameNoPreview, .nameNoPreview: notificationBody = "messageNewYouveGotA".localized() case .noNameNoPreview, .nameNoPreview: notificationBody = "messageNewYouveGot"
.putNumber(1)
.localized()
case .nameAndPreview: notificationBody = messageText case .nameAndPreview: notificationBody = messageText
} }
@ -324,7 +326,9 @@ public class NotificationPresenter: NotificationsProtocol {
switch previewType { switch previewType {
case .nameAndPreview: break case .nameAndPreview: break
default: notificationBody = "messageNewYouveGotA".localized() default: notificationBody = "messageNewYouveGot"
.putNumber(1)
.localized()
} }
let category = AppNotificationCategory.incomingMessage let category = AppNotificationCategory.incomingMessage

4
Session/Notifications/UserNotificationsAdaptee.swift
Unescape Escape View File

@ -153,8 +153,8 @@ extension UserNotificationPresenterAdaptee: NotificationPresenterAdaptee {
content.title : content.title :
threadName threadName
) )
content.body = "messageNewYouveGotMany" content.body = "messageNewYouveGot"
.put(key: "count", value: numberOfNotifications) .putNumber(numberOfNotifications)
.localized() .localized()
} }

2
Session/Onboarding/LoadAccountScreen.swift
Unescape Escape View File

@ -162,7 +162,7 @@ struct EnterRecoveryPasswordScreen: View{
Spacer(minLength: 0) Spacer(minLength: 0)
.frame(maxHeight: 2 * Values.mediumSpacing) .frame(maxHeight: 2 * Values.mediumSpacing)
Text("onboardingRecoveryPassword".localized()) Text("recoveryPasswordRestoreDescription".localized())
.font(.system(size: Values.smallFontSize)) .font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .textPrimary) .foregroundColor(themeColor: .textPrimary)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

6
Session/Settings/BlockedContactsViewModel.swift
Unescape Escape View File

@ -174,12 +174,14 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo
.first(where: { section in section.model == .contacts }), .first(where: { section in section.model == .contacts }),
let info: SessionCell.Info<TableItem> = section.elements let info: SessionCell.Info<TableItem> = section.elements
.first(where: { info in info.id.id == contactId }) .first(where: { info in info.id.id == contactId })
else { return contactId } else {
return Profile.truncated(id: contactId, truncating: .middle)
}
return info.title?.text return info.title?.text
} }
let confirmationTitle: String = { let confirmationTitle: String = {
let name: String = contactNames.first ?? "CONVERSATION_SETTINGS_BLOCKED_CONTACTS_UNBLOCK_CONFIRMATION_TITLE_FALLBACK".localized() let name: String = contactNames.first ?? ""
switch contactNames.count { switch contactNames.count {
case 1: case 1:
return "blockUnblockDescription" return "blockUnblockDescription"

5
Session/Settings/NotificationSoundViewModel.swift
Unescape Escape View File

@ -108,10 +108,7 @@ class NotificationSoundViewModel: SessionTableViewModel, NavigationItemSource, N
id: sound, id: sound,
title: { title: {
guard sound != .note else { guard sound != .note else {
return String( return "\(sound.displayName) (default)"
format: "SETTINGS_AUDIO_DEFAULT_TONE_LABEL_FORMAT".localized(),
sound.displayName
)
} }
return sound.displayName return sound.displayName

16
Session/Settings/NukeDataModal.swift
Unescape Escape View File

@ -244,18 +244,10 @@ final class NukeDataModal: Modal {
return return
} }
let message: String let message: String = "clearDataErrorDescription"
if potentiallyMaliciousSnodes.count == 1 { .putNumber(potentiallyMaliciousSnodes.count)
message = "clearDataErrorDescription1" .put(key: "service_node_id", value: potentiallyMaliciousSnodes.joined(separator: ", "))
.put(key: "service_node_id", value: potentiallyMaliciousSnodes[0]) .localized()
.localized()
}
else {
message = "clearDataErrorDescription2"
.put(key: "count", value: potentiallyMaliciousSnodes.count)
.put(key: "service_node_id", value: potentiallyMaliciousSnodes.joined(separator: ", "))
.localized()
}
let modal: ConfirmationModal = ConfirmationModal( let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view, targetView: self?.view,

2
Session/Settings/PrivacySettingsViewModel.swift
Unescape Escape View File

@ -148,7 +148,7 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav
SessionCell.Info( SessionCell.Info(
id: .communityMessageRequests, id: .communityMessageRequests,
title: "messageRequestsCommunities".localized(), title: "messageRequestsCommunities".localized(),
subtitle: "messageReqeuestsCommunitiesDescription".localized(), subtitle: "messageRequestsCommunitiesDescription".localized(),
rightAccessory: .toggle( rightAccessory: .toggle(
.boolValue( .boolValue(
key: .checkForCommunityMessageRequests, key: .checkForCommunityMessageRequests,

4
Session/Utilities/Permissions.swift
Unescape Escape View File

@ -69,7 +69,9 @@ public enum Permissions {
info: ConfirmationModal.Info( info: ConfirmationModal.Info(
title: "permissionsRequired".localized(), title: "permissionsRequired".localized(),
body: .text( body: .text(
"permissionsMicrophoneAccessRequired".localized() "permissionsMicrophoneAccessRequiredDesktop"
.put(key: "app_name", value: Singleton.appName)
.localized()
), ),
confirmTitle: "sessionSettings".localized(), confirmTitle: "sessionSettings".localized(),
dismissOnConfirm: false, dismissOnConfirm: false,

14
SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
Unescape Escape View File

@ -40,24 +40,14 @@ extension String {
extension SignalAttachmentError: LocalizedError { extension SignalAttachmentError: LocalizedError {
public var errorDescription: String? { public var errorDescription: String? {
switch self { switch self {
case .missingData:
return "ATTACHMENT_ERROR_MISSING_DATA".localized()
case .fileSizeTooLarge: case .fileSizeTooLarge:
return "attachmentsErrorSize".localized() return "attachmentsErrorSize".localized()
case .invalidData: case .invalidData, .missingData, .invalidFileFormat:
return "attachmentsErrorNotSupported".localized() return "attachmentsErrorNotSupported".localized()
case .couldNotParseImage: case .couldNotConvertToJpeg, .couldNotParseImage, .couldNotConvertToMpeg4, .couldNotResizeImage:
return "ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE".localized()
case .couldNotConvertToJpeg:
return "attachmentsErrorOpen".localized() return "attachmentsErrorOpen".localized()
case .invalidFileFormat:
return "attachmentsErrorNotSupported".localized()
case .couldNotConvertToMpeg4:
return "ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4".localized()
case .couldNotRemoveMetadata: case .couldNotRemoveMetadata:
return "attachmentsImageErrorMetadata".localized() return "attachmentsImageErrorMetadata".localized()
case .couldNotResizeImage:
return "ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE".localized()
} }
} }
} }

21
SessionNotificationServiceExtension/NSENotificationPresenter.swift
Unescape Escape View File

@ -43,7 +43,10 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol {
let snippet: String = (interaction.previewText(db) let snippet: String = (interaction.previewText(db)
.filterForDisplay? .filterForDisplay?
.replacingMentions(for: thread.id)) .replacingMentions(for: thread.id))
.defaulting(to: "messageNewYouveGotA".localized()) .defaulting(to: "messageNewYouveGot"
.putNumber(1)
.localized()
)
let userInfo: [String: Any] = [ let userInfo: [String: Any] = [
NotificationServiceExtension.isFromRemoteKey: true, NotificationServiceExtension.isFromRemoteKey: true,
@ -71,11 +74,15 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol {
case .nameNoPreview: case .nameNoPreview:
notificationContent.title = notificationTitle notificationContent.title = notificationTitle
notificationContent.body = "messageNewYouveGotA".localized() notificationContent.body = "messageNewYouveGot"
.putNumber(1)
.localized()
case .noNameNoPreview: case .noNameNoPreview:
notificationContent.title = Singleton.appName notificationContent.title = Singleton.appName
notificationContent.body = "messageNewYouveGotA".localized() notificationContent.body = "messageNewYouveGot"
.putNumber(1)
.localized()
} }
// If it's a message request then overwrite the body to be something generic (only show a notification // If it's a message request then overwrite the body to be something generic (only show a notification
@ -110,8 +117,8 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol {
notificationContent.title : notificationContent.title :
groupName groupName
) )
notificationContent.body = "messageNewYouveGotMany" notificationContent.body = "messageNewYouveGot"
.put(key: "count", value: numberOfNotifications) .putNumber(numberOfNotifications)
.localized() .localized()
} }
@ -203,7 +210,9 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol {
switch previewType { switch previewType {
case .nameAndPreview: break case .nameAndPreview: break
default: notificationBody = "messageNewYouveGotA".localized() default: notificationBody = "messageNewYouveGot"
.putNumber(1)
.localized()
} }
let userInfo: [String: Any] = [ let userInfo: [String: Any] = [

4
SessionNotificationServiceExtension/NotificationServiceExtension.swift
Unescape Escape View File

@ -501,7 +501,9 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
Log.flush() Log.flush()
content.title = Singleton.appName content.title = Singleton.appName
content.body = "messageNewYouveGotA".localized() content.body = "messageNewYouveGot"
.putNumber(1)
.localized()
let userInfo: [String: Any] = [ NotificationServiceExtension.isFromRemoteKey: true ] let userInfo: [String: Any] = [ NotificationServiceExtension.isFromRemoteKey: true ]
content.userInfo = userInfo content.userInfo = userInfo
contentHandler!(content) contentHandler!(content)

21
SessionUtilitiesKit/General/Localization.swift
Unescape Escape View File

@ -181,6 +181,7 @@ private extension Collection where Element == NSAttributedString.HTMLTag {
final public class LocalizationHelper: CustomStringConvertible { final public class LocalizationHelper: CustomStringConvertible {
private let template: String private let template: String
private var replacements: [String : String] = [:] private var replacements: [String : String] = [:]
private var numbers: [Int] = []
// MARK: - Initialization // MARK: - Initialization
@ -194,11 +195,16 @@ final public class LocalizationHelper: CustomStringConvertible {
replacements[key] = value.description replacements[key] = value.description
return self return self
} }
public func putNumber(_ number: Int, index: Int) -> LocalizationHelper {
self.numbers.insert(number, at: index)
return self
}
public func localized() -> String { public func localized() -> String {
// If the localized string matches the key provided then the localisation failed // If the localized string matches the key provided then the localisation failed
var localizedString: String = NSLocalizedString(template, comment: "") var localizedString: String = NSLocalizedString(template, comment: "")
for (key, value) in replacements { for (key, value) in replacements {
localizedString = localizedString.replacingOccurrences(of: tokenize(key), with: value) localizedString = localizedString.replacingOccurrences(of: tokenize(key), with: value)
} }
@ -206,6 +212,15 @@ final public class LocalizationHelper: CustomStringConvertible {
// Replace html tag "<br/>" with "\n" // Replace html tag "<br/>" with "\n"
localizedString = localizedString.replacingOccurrences(of: "<br/>", with: "\n") localizedString = localizedString.replacingOccurrences(of: "<br/>", with: "\n")
// Deal with plurals
if !self.numbers.isEmpty {
localizedString = String(
format: localizedString,
locale: .current,
arguments: self.numbers
)
}
return localizedString return localizedString
} }
@ -260,6 +275,10 @@ public extension String {
func put(key: String, value: CustomStringConvertible) -> LocalizationHelper { func put(key: String, value: CustomStringConvertible) -> LocalizationHelper {
return LocalizationHelper(template: self).put(key: key, value: value) return LocalizationHelper(template: self).put(key: key, value: value)
} }
func putNumber(_ number: Int, index: Int = 0) -> LocalizationHelper {
return LocalizationHelper(template: self).putNumber(number, index: index)
}
func localized() -> String { func localized() -> String {
return LocalizationHelper(template: self).localized() return LocalizationHelper(template: self).localized()

Write Preview
Loading…
Cancel
Save