Skip to content

Commit

Permalink
- Adds Russian and Ukrainian localisation for iCloud Drive detection …
Browse files Browse the repository at this point in the history 
…feature
  • Loading branch information
@glushchenko
glushchenko committed May 6, 2020
1 parent ee6c04f commit 5250953
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 19 deletions.
16 changes: 8 additions & 8 deletions FSNotes.xcodeproj/project.pbxproj
View file
Expand Up @@ -4367,12 +4367,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 167;
CURRENT_PROJECT_VERSION = 169;
DEVELOPMENT_TEAM = 866P6MTE92;
INFOPLIST_FILE = "FSNotes iOS Share/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 3.2.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS.FSNotes-iOS-Share";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -4391,13 +4391,13 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 167;
CURRENT_PROJECT_VERSION = 169;
DEVELOPMENT_TEAM = 866P6MTE92;
ENABLE_NS_ASSERTIONS = NO;
INFOPLIST_FILE = "FSNotes iOS Share/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 3.2.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS.FSNotes-iOS-Share";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -4419,12 +4419,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 167;
CURRENT_PROJECT_VERSION = 169;
DEVELOPMENT_TEAM = 866P6MTE92;
INFOPLIST_FILE = "FSNotes iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.2.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -4449,13 +4449,13 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 167;
CURRENT_PROJECT_VERSION = 169;
DEVELOPMENT_TEAM = 866P6MTE92;
ENABLE_NS_ASSERTIONS = NO;
INFOPLIST_FILE = "FSNotes iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.2.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "co.fluder.mobile.FSNotes-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down
22 changes: 13 additions & 9 deletions FSNotes/AppDelegate.swift
View file
Expand Up @@ -335,22 +335,26 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
let alert = NSAlert()
alert.messageText = messageText
alert.informativeText =
NSLocalizedString("Otherwise you note database will be available at: ", comment: "") + currentURL.path
NSLocalizedString("Otherwise, the database of your notes will be available at: ", comment: "") + currentURL.path

alert.alertStyle = .warning
alert.addButton(withTitle: "No")
alert.addButton(withTitle: "Yes")
alert.addButton(withTitle: NSLocalizedString("No", comment: ""))
alert.addButton(withTitle: NSLocalizedString("Yes", comment: ""))
if alert.runModal() == .alertSecondButtonReturn {
if let list = try? FileManager.default.contentsOfDirectory(at: currentURL, includingPropertiesForKeys: nil, options: .init()) {
for item in list {
do {
let dst = url.appendingPathComponent(item.lastPathComponent)
try FileManager.default.moveItem(at: item, to: dst)
let dst = url.appendingPathComponent(item.lastPathComponent)
try FileManager.default.moveItem(at: item, to: dst)
} catch {
let exist = NSAlert()
exist.messageText = "We can not move \"\(item.path)\" because this item already exist in selected destination."
exist.addButton(withTitle: "OK")
exist.runModal()
let exist = NSAlert()
let message = NSLocalizedString("We can not move \"{DST_PATH}\" because this item already exist in selected destination.", comment: "")

message = message.replacingOccurrences(of: "{DST_PATH}", with: item.path)

exist.messageText = message
exist.addButton(withTitle: NSLocalizedString("OK", comment: ""))
exist.runModal()
}
}
}
Expand Down
11 changes: 10 additions & 1 deletion FSNotes/ru.lproj/Localizable.strings
View file
Expand Up @@ -103,11 +103,14 @@
/* No comment provided by engineer. */
"New RTF" = "Создать RTF";

/* No comment provided by engineer. */
"No" = "Нет";

/* Sidebar label */
"Notes" = "Заметки";

/* No comment provided by engineer. */
"Otherwise you note database will be available at: " = "В противном случае база данных заметок будет доступна по адресу:";
"Otherwise, the database of your notes will be available at: " = "В противном случае база данных заметок будет доступна по адресу: ";

/* Edit area */
"Please enter image title:" = "Пожалуйста, введите заголовок изображения:";
Expand Down Expand Up @@ -203,6 +206,12 @@
/* No comment provided by engineer. */
"We are detect that you are install FSNotes from Mac App Store with default storage in iCloud Drive, do you want to move old database in iCloud Drive?" = "Мы обнаружили, что вы установили FSNotes из Mac App Store с хранилищем по умолчанию в iCloud Drive. Хотите ли вы перенести старую базу данных в iCloud Drive?";

/* No comment provided by engineer. */
"We can not move \"{DST_PATH}\" because this item already exist in selected destination." = "Мы не можем переместить \\\"{DST_PATH}\\\", потому что этот путь уже существует в выбранном месте назначения.";

/* No comment provided by engineer. */
"Wrong repeated password" = "Несоответствие паролей";

/* No comment provided by engineer. */
"Yes" = "Да";

18 changes: 18 additions & 0 deletions FSNotes/uk.lproj/Localizable.strings
View file
Expand Up @@ -58,6 +58,9 @@
/* No comment provided by engineer. */
"Detach storage" = "Відключити сховище";

/* No comment provided by engineer. */
"Do you want to move current notes in the new destination?" = "Ви хочете перемістити поточні нотатки до нового сховища?";

/* No comment provided by engineer. */
"Empty password" = "Введіть пароль";

Expand Down Expand Up @@ -118,9 +121,15 @@
/* No comment provided by engineer. */
"New RTF" = "Новий RTF";

/* No comment provided by engineer. */
"No" = "Ні";

/* Sidebar label */
"Notes" = "Нотатки";

/* No comment provided by engineer. */
"Otherwise, the database of your notes will be available at: " = "Інакше база даних ваших нотаток буде доступна за адресою: ";

/* Edit area */
"Please enter image title:" = "Заголовок зображення:";

Expand Down Expand Up @@ -215,6 +224,15 @@
/* Menu */
"View" = "Вид";

/* No comment provided by engineer. */
"We are detect that you are install FSNotes from Mac App Store with default storage in iCloud Drive, do you want to move old database in iCloud Drive?" = "Ми виявили, що ви встановили FSNotes з Mac App Store із зберіганням за замовчуванням в iCloud Drive, хочете перенести стару базу даних в iCloud Drive?";

/* No comment provided by engineer. */
"We can not move \"{DST_PATH}\" because this item already exist in selected destination." = "Ми не можемо перемістити \\\"{DST_PATH}\\\", оскільки цей елемент вже існує у вибраному сховищі.";

/* No comment provided by engineer. */
"Wrong repeated password" = "Паролі не співпадають";

/* No comment provided by engineer. */
"Yes" = "Так";

5 changes: 4 additions & 1 deletion ru.lproj/Localizable.strings
View file
Expand Up @@ -23,7 +23,7 @@
"Notes" = "Заметки";

/* No comment provided by engineer. */
"Otherwise you note database will be available at: " = "В противном случае база данных заметок будет доступна по адресу:";
"Otherwise, the database of your notes will be available at: " = "В противном случае база данных заметок будет доступна по адресу: ";

/* No comment provided by engineer. */
"Show in Finder" = "Показать в Finder";
Expand All @@ -40,3 +40,6 @@
/* No comment provided by engineer. */
"We are detect that you are install FSNotes from Mac App Store with default storage in iCloud Drive, do you want to move old database in iCloud Drive?" = "Мы обнаружили, что вы установили FSNotes из Mac App Store с хранилищем по умолчанию в iCloud Drive. Хотите ли вы перенести старую базу данных в iCloud Drive?";

/* No comment provided by engineer. */
"We can not move \"{DST_PATH}\" because this item already exist in selected destination." = "Мы не можем переместить \\\"{DST_PATH}\\\", потому что этот путь уже существует в выбранном месте назначения.";

18 changes: 18 additions & 0 deletions uk.lproj/Localizable.strings
View file
Expand Up @@ -13,15 +13,24 @@
/* No comment provided by engineer. */
"Detach storage" = "Відключити сховище";

/* No comment provided by engineer. */
"Do you want to move current notes in the new destination?" = "Ви хочете перемістити поточні нотатки до нового сховища?";

/* No comment provided by engineer. */
"History" = "Історія";

/* No comment provided by engineer. */
"Inbox" = "Вхідні";

/* No comment provided by engineer. */
"No" = "Ні";

/* Sidebar label */
"Notes" = "Нотатки";

/* No comment provided by engineer. */
"Otherwise, the database of your notes will be available at: " = "Інакше база даних ваших нотаток буде доступна за адресою: ";

/* No comment provided by engineer. */
"Show in Finder" = "Показати в Finder";

Expand All @@ -34,3 +43,12 @@
/* Sidebar label */
"Trash" = "Сміття";

/* No comment provided by engineer. */
"We are detect that you are install FSNotes from Mac App Store with default storage in iCloud Drive, do you want to move old database in iCloud Drive?" = "Ми виявили, що ви встановили FSNotes з Mac App Store із зберіганням за замовчуванням в iCloud Drive, хочете перенести стару базу даних в iCloud Drive?";

/* No comment provided by engineer. */
"We can not move \"{DST_PATH}\" because this item already exist in selected destination." = "Ми не можемо перемістити \\\"{DST_PATH}\\\", оскільки цей елемент вже існує у вибраному сховищі.";

/* No comment provided by engineer. */
"Yes" = "Так";

0 comments on commit 5250953

Please sign in to comment.