Skip to content

fix(l10n): Standardize localization keys and restore missing English strings #4462

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

Merged
marinofaggiana merged 2 commits into from
Nov 12, 2026
Merged

fix(l10n): Standardize localization keys and restore missing English strings #4462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beb697e
chore: clean up English localization strings and bump build number
marinofaggiana Nov 12, 2026
4b8b113
refactor: standardize localization keys and remove duplicates
marinofaggiana Nov 12, 2026
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
2 changes: 1 addition & 1 deletion Brand/Intro/NCIntroViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class NCIntroViewController: UIViewController, UICollectionViewDataSource, UICol
buttonSignUp.setTitle(NSLocalizedString("_sign_up_", comment: ""), for: .normal)

buttonHost.layer.cornerRadius = 20
buttonHost.setTitle(NSLocalizedString("_host_your_own_server", comment: ""), for: .normal)
buttonHost.setTitle(NSLocalizedString("_host_your_own_server_", comment: ""), for: .normal)
buttonHost.setTitleColor(textColor.withAlphaComponent(0.5), for: .normal)

introCollectionView.register(UINib(nibName: "NCIntroCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "introCell")
Expand Down
4 changes: 2 additions & 2 deletions File Provider Extension UI/DocumentActionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ class DocumentActionViewController: FPUIActionExtensionViewController {
if let userInfo = (error as NSError).userInfo as NSDictionary?,
let code = userInfo["code"] as? Int {
if code == NCGlobal.shared.errorUnauthorizedFilesPasscode {
titleError?.text = NSLocalizedString("_unauthorizedFilesPasscode_", comment: "")
titleError?.text = NSLocalizedString("_unauthorized_files_passcode_", comment: "")
} else if code == NCGlobal.shared.errorDisableFilesApp {
titleError?.text = NSLocalizedString("_disableFilesApp_", comment: "")
titleError?.text = NSLocalizedString("_files_app_disabled_", comment: "")
} else if code == NCGlobal.shared.errorVersionMismatch {
titleError?.text = NSLocalizedString("_version_mismatch_error_", comment: "")
}
Expand Down
4 changes: 2 additions & 2 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6667,7 +6667,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = NKUJUXUJ3B;
Expand Down Expand Up @@ -6735,7 +6735,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = NKUJUXUJ3B;
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Account/StatusMessage/NCStatusMessageModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ import NextcloudKit

if hour > 0 {
if hour == 1 { return NSLocalizedString("_an_hour_", comment: "") }
if hour == 4 { return NSLocalizedString("_4_hour_", comment: "") }
if hour == 4 { return NSLocalizedString("_4_hours_", comment: "") }
return "\(hour) " + NSLocalizedString("_hours_", comment: "")
}

Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Albums/NCAlbumsNavigationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class NCAlbumsNavigationController: NCMainNavigationController {
let item = screen.navigationItem
item.largeTitleDisplayMode = .never
if let viewModel = screen.listViewModel {
screen.title = NSLocalizedString("_albums_list_nav_title_", comment: "")
screen.title = NSLocalizedString("_albums_", comment: "")
item.rightBarButtonItem = UIBarButtonItem(
title: NSLocalizedString("_albums_list_new_album_btn_", comment: ""),
image: UIImage(systemName: "plus"),
Expand All @@ -34,7 +34,7 @@ class NCAlbumsNavigationController: NCMainNavigationController {
primaryAction: UIAction { [weak viewModel] _ in viewModel?.onAddPhotosIntent() }
)
let rename = UIAction(
title: NSLocalizedString("_albums_photos_rename_album_btn_", comment: ""),
title: NSLocalizedString("_albums_list_rename_album_popup_title_", comment: ""),
image: UIImage(systemName: "pencil")
) { [weak viewModel] _ in viewModel?.onRenameAlbumIntent() }
let delete = UIAction(
Expand Down
8 changes: 4 additions & 4 deletions iOSClient/Albums/Presentation/Alerts/NCInputAlbumNameAlertModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ private struct NCInputAlbumNameAlertModifier: ViewModifier {
title = NSLocalizedString("_albums_list_rename_album_popup_title_", comment: "")
description = NSLocalizedString("_albums_list_rename_album_popup_desc_", comment: "")
textFieldHint = NSLocalizedString("_albums_list_rename_album_popup_hint_", comment: "")
positiveButtonText = NSLocalizedString("_albums_list_rename_album_popup_positive_btn_", comment: "")
negativeButtonText = NSLocalizedString("_albums_list_rename_album_popup_negative_btn_", comment: "")
positiveButtonText = NSLocalizedString("_rename_", comment: "")
negativeButtonText = NSLocalizedString("_cancel_", comment: "")
} else {
title = NSLocalizedString("_albums_list_new_album_popup_title_", comment: "")
description = NSLocalizedString("_albums_list_new_album_popup_desc_", comment: "")
textFieldHint = NSLocalizedString("_albums_list_new_album_popup_hint_", comment: "")
positiveButtonText = NSLocalizedString("_albums_list_new_album_popup_positive_btn_", comment: "")
negativeButtonText = NSLocalizedString("_albums_list_new_album_popup_negative_btn_", comment: "")
positiveButtonText = NSLocalizedString("_create_", comment: "")
negativeButtonText = NSLocalizedString("_cancel_", comment: "")
}
}

Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Albums/Presentation/Details/AlbumDetailsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ struct AlbumDetailsScreen: View {
isPresented: $viewModel.isDeleteAlbumPopupVisible,
actions: {
Button(
NSLocalizedString("_albums_delete_album_popup_positive_btn_", comment: ""),
NSLocalizedString("_delete_", comment: ""),
role: .destructive,
action: viewModel.onDeleteAlbumPopupConfirm
)
Button(
NSLocalizedString("_albums_delete_album_popup_negative_btn_", comment: ""),
NSLocalizedString("_cancel_", comment: ""),
role: .cancel,
action: viewModel.onDeleteAlbumPopupCancel
)
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Albums/Presentation/List/AddToAlbumsListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct AddToAlbumsListView: View {
}
.listStyle(.plain)
.scrollContentBackground(.hidden)
.navigationTitle(NSLocalizedString("_add_to_album", comment: ""))
.navigationTitle(NSLocalizedString("_add_to_album_", comment: ""))
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
}
} else {
let message = String(
format: NSLocalizedString("account_does_not_exist", comment: ""),
format: NSLocalizedString("_account_does_not_exist_", comment: ""),
account
)

Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Extensions/UIAlertController+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ extension UIAlertController {
message = errorMessage
messageColor = .red
} else if isFileHidden {
message = NSLocalizedString("hidden_file_name_warning", comment: "")
message = NSLocalizedString("_hidden_file_name_warning_", comment: "")
} else if alreadyExists {
message = NSLocalizedString("_item_with_same_name_already_exists_", comment: "")
}
Expand Down Expand Up @@ -270,7 +270,7 @@ extension UIAlertController {
message = errorMessage
messageColor = .red
} else if isFileHidden {
message = NSLocalizedString("hidden_file_name_warning", comment: "")
message = NSLocalizedString("_hidden_file_name_warning_", comment: "")
} else if newExtension != oldExtension {
message = NSLocalizedString("_file_name_new_extension_", comment: "")
}
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Files/NCFiles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ class NCFiles: NCCollectionViewCommon {

return NKError(
errorCode: global.errorInternalError,
errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: "")
errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: "")
)
}

Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Main/Collection Common/NCCollectionViewDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ class NCCollectionViewDataSource: NSObject {
// like inserted
} else {
// normal
let favorite = NSLocalizedString("favorite", comment: "").lowercased().firstUppercased
let directory = NSLocalizedString("directory", comment: "").lowercased().firstUppercased
let favorite = NSLocalizedString("_favorite_short_", comment: "").lowercased().firstUppercased
let directory = NSLocalizedString("_directory_", comment: "").lowercased().firstUppercased

self.sections = self.sections.sorted { lhs, rhs in
// 1. favorite on top
Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Main/Create/Upload Assets/NCUploadAssetsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ struct NCUploadAssetsView: View {
Button(action: {
model.previewStore[index].nativeFormat = false
}) {
Label(NSLocalizedString("_Upload_native_format_yes_", comment: ""), systemImage: "eye")
Label(NSLocalizedString("_upload_native_format_yes_", comment: ""), systemImage: "eye")
}
} else {
Button(action: {
model.previewStore[index].nativeFormat = true
}) {
Label(NSLocalizedString("_Upload_native_format_no_", comment: ""), systemImage: "eye.slash")
Label(NSLocalizedString("_upload_native_format_no_", comment: ""), systemImage: "eye.slash")
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions iOSClient/Media/NCMediaNavigationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class NCMediaNavigationController: NCMainNavigationController {

let actionsInEditMode: [UIAction] = [
UIAction(
title: NSLocalizedString("_add_to_album", comment: ""),
title: NSLocalizedString("_add_to_album_", comment: ""),
image: utility.loadImage(named: "photo.badge.plus.fill"),
handler: { _ in
guard let controller = self.controller else { return }
Expand Down Expand Up @@ -292,11 +292,11 @@ class NCMediaNavigationController: NCMainNavigationController {
textField.placeholder = NSLocalizedString("_albums_list_new_album_popup_hint_", comment: "")
}

alert.addAction(UIAlertAction(title: NSLocalizedString("_albums_list_new_album_popup_negative_btn_", comment: ""), style: .default) { _ in
alert.addAction(UIAlertAction(title: NSLocalizedString("_cancel_", comment: ""), style: .default) { _ in
onCancel()
})

alert.addAction(UIAlertAction(title: NSLocalizedString("_albums_list_new_album_popup_positive_btn_", comment: ""), style: .default) { _ in
alert.addAction(UIAlertAction(title: NSLocalizedString("_create_", comment: ""), style: .default) { _ in
let text = alert.textFields?.first?.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
if text.isEmpty {
let emptyAlert = UIAlertController(
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Networking/E2EE/NCEndToEndKeySetAccess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ enum NCEndToEndKeySetAccess: Equatable, Sendable {
case .unavailable:
return NKError(
errorCode: NCGlobal.shared.errorE2EENoUserFound,
errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: "")
errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: "")
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Networking/E2EE/NCEndToEndMetadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class NCEndToEndMetadata: NSObject {
)

return (
NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: "")),
NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: "")),
.unavailable
)
}
Expand All @@ -93,7 +93,7 @@ class NCEndToEndMetadata: NSObject {
return (
NKError(
errorCode: NCGlobal.shared.errorE2EENoUserFound,
errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: "")
errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: "")
),
.unavailable
)
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Networking/E2EE/NCEndToEndMetadataV2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
let metadataKey = tableUser.metadataKey?.base64EncodedString(),
let decryptedMetadataKey = tableUser.metadataKey else {
return NKError(errorCode: NCGlobal.shared.errorE2EENoUserFound,
errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: ""))
errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: ""))
}

// FILEDROP
Expand Down Expand Up @@ -388,7 +388,7 @@
// DELETE CHECK
//
if let deleted = jsonCiphertextMetadata.deleted, deleted {
// TODO: We need to check deleted, id yes ???

Check warning on line 391 in iOSClient/Networking/E2EE/NCEndToEndMetadataV2.swift

View workflow job for this annotation

GitHub Actions / Lint 

Todo Violation: TODOs should be resolved (We need to check deleted, id y...) (todo)
}

await self.database.addE2eMetadataAsync(account: session.account,
Expand Down
8 changes: 4 additions & 4 deletions iOSClient/Networking/E2EE/NCNetworkingE2EE.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class NCNetworkingE2EE: NSObject {
let serverPublicKey = preferences.getEndToEndPublicKey(account: account),
!serverPublicKey.isEmpty else {
nkLog(tag: NCGlobal.shared.logTagE2EE, message: "Server-key validation skipped because the active key set is incomplete.")
return NKError(errorCode: NCGlobal.shared.errorE2EENotEnabled, errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: ""))
return NKError(errorCode: NCGlobal.shared.errorE2EENotEnabled, errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: ""))
}

if preferences.isEndToEndServerKeyStale(account: account) {
Expand Down Expand Up @@ -366,7 +366,7 @@ class NCNetworkingE2EE: NSObject {
nkLog(tag: NCGlobal.shared.logTagE2EE, emoji: .error, message: "Unable to resolve the stored E2EE key set: \(error)")

await unlock(account: session.account, serverUrl: serverUrl)
return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: ""))
return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: ""))
}

guard storedAccess.writeAccessError == .success else {
Expand Down Expand Up @@ -454,7 +454,7 @@ class NCNetworkingE2EE: NSObject {
} catch {
nkLog(tag: NCGlobal.shared.logTagE2EE, emoji: .error, message: "Unable to resolve E2EE key-set access: \(error)")

return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: ""))
return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: ""))
}

let writeAccessError = access.writeAccessError
Expand Down Expand Up @@ -514,7 +514,7 @@ class NCNetworkingE2EE: NSObject {
} catch {
nkLog(tag: NCGlobal.shared.logTagE2EE, emoji: .error, message: "Unable to resolve the stored E2EE key set: \(error)")

return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadataKey_found_", comment: ""))
return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_e2ee_no_metadata_key_found_", comment: ""))
}
}
return resultsGetE2EEMetadata.error
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
Task {
if await getMatchedAccount(user: userScheme, url: urlScheme) == nil {
let message = String(
format: NSLocalizedString("account_does_not_exist", comment: ""),
format: NSLocalizedString("_account_does_not_exist_", comment: ""),
userScheme,
)

Expand Down
6 changes: 3 additions & 3 deletions iOSClient/Settings/Advanced/NCSettingsAdvancedView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ struct NCSettingsAdvancedView: View {

// Remove from Camera Roll
Section(content: {
Toggle(NSLocalizedString("_remove_photo_CameraRoll_", comment: ""), isOn: $model.removeFromCameraRoll)
Toggle(NSLocalizedString("_remove_photo_camera_roll_", comment: ""), isOn: $model.removeFromCameraRoll)
.font(.body)
.tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
.onChange(of: model.removeFromCameraRoll) {
model.updateRemoveFromCameraRoll()
}
}, footer: {
Text(NSLocalizedString("_remove_photo_CameraRoll_desc_", comment: ""))
Text(NSLocalizedString("_remove_photo_camera_roll_desc_", comment: ""))
.font(.footnote)
})

Expand Down Expand Up @@ -105,7 +105,7 @@ struct NCSettingsAdvancedView: View {
showCrashReporter.toggle()
}
.alert(NSLocalizedString("_crashservice_title_", comment: ""), isPresented: $showCrashReporter, actions: {
Button(NSLocalizedString("OK", comment: ""), role: .cancel) {
Button(NSLocalizedString("_ok_", comment: ""), role: .cancel) {
model.exitNextCloud(ext: showCrashReporter)
}
}, message: {
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Share/NCShare.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class NCShare: UIViewController, NCSharePagingContent {
viewContainerConstraint.constant = height
searchFieldTopConstraint.constant = 0

searchField.placeholder = NSLocalizedString("_shareLinksearch_placeholder_", comment: "")
searchField.placeholder = NSLocalizedString("_share_link_search_placeholder_", comment: "")
searchField.autocorrectionType = .no

tableView.dataSource = self
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Share/NCTagEditorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct NCTagEditorView: View {
.searchable(
text: $model.searchText,
isPresented: $isSearchPresented,
prompt: Text(NSLocalizedString("_search_or_create_tags", comment: ""))
prompt: Text(NSLocalizedString("_search_or_create_tags_", comment: ""))
)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Expand Down
Loading
Loading