Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit 860770d

Browse files
committed
- updated new localizable keys to match the others
- added missing romanian strings - general clean up
1 parent a6a0528 commit 860770d

19 files changed

+126
-142
lines changed

Classes/Cells/CommentImageTableViewCell.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@ class CommentImageTableViewCell: UITableViewCell {
1313

1414
@IBOutlet weak var dateLabel: UILabel!
1515
@IBOutlet weak var commentImageView: UIImageView!
16-
17-
override func awakeFromNib() {
18-
super.awakeFromNib()
19-
}
20-
21-
override func setSelected(_ selected: Bool, animated: Bool) {
22-
super.setSelected(selected, animated: animated)
23-
24-
// Configure the view for the selected state
25-
}
2616

2717
class func getIdentifier() -> String {
2818
return "commentImageCell"

Classes/Cells/CommentTableViewCell.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ class CommentTableViewCell: UITableViewCell {
2323
self.contentLabel.urlMaximumLength = 25
2424
}
2525

26-
override func setSelected(_ selected: Bool, animated: Bool) {
27-
super.setSelected(selected, animated: animated)
28-
29-
// Configure the view for the selected state
30-
}
31-
3226
class func getIdentifier() -> String {
3327
return "commentCell"
3428
}

Classes/Cells/HomeTableViewCell.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ class HomeTableViewCell: UITableViewCell {
1313
@IBOutlet weak var itemTitle: UILabel!
1414
@IBOutlet weak var itemImageView: UIImageView!
1515
@IBOutlet weak var itemCountLabel: UILabel!
16-
17-
override func awakeFromNib() {
18-
super.awakeFromNib()
19-
// Initialization code
20-
}
21-
22-
override func setSelected(_ selected: Bool, animated: Bool) {
23-
super.setSelected(selected, animated: animated)
24-
25-
// Configure the view for the selected state
26-
}
2716

2817
class func getIdentifier() -> String {
2918
return "homeCell"

Classes/Cells/ReminderTableViewCell.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ import UIKit
1111
class ReminderTableViewCell: UITableViewCell {
1212

1313
@IBOutlet weak var contentLabel: UILabel!
14-
15-
override func awakeFromNib() {
16-
super.awakeFromNib()
17-
18-
19-
}
20-
21-
override func setSelected(_ selected: Bool, animated: Bool) {
22-
super.setSelected(selected, animated: animated)
23-
24-
// Configure the view for the selected state
25-
}
2614

2715
class func getIdentifier() -> String {
2816
return "reminderCell"

Classes/Cells/SettingsTableViewCell.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ class SettingsTableViewCell: UITableViewCell {
1616
@IBOutlet weak var rightLabel: UILabel!
1717
@IBOutlet weak var rightSwitch: UISwitch!
1818

19-
override func awakeFromNib() {
20-
super.awakeFromNib()
21-
22-
23-
}
24-
25-
override func setSelected(_ selected: Bool, animated: Bool) {
26-
super.setSelected(selected, animated: animated)
27-
28-
// Configure the view for the selected state
29-
}
30-
3119
func updateUI() {
3220
self.rightSwitch.onTintColor = Utils().getCurrentThemeColor()
3321
}

Classes/Cells/TaskTableViewCell.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ class TaskTableViewCell: UITableViewCell {
2323
checkBoxButton.imageView?.contentMode = .scaleAspectFit
2424
}
2525

26-
override func setSelected(_ selected: Bool, animated: Bool) {
27-
super.setSelected(selected, animated: animated)
28-
29-
// Configure the view for the selected state
30-
}
31-
3226
class func getIdentifier() -> String {
3327
return "taskCell"
3428
}

Classes/Cells/ThemeTableViewCell.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ class ThemeTableViewCell: UITableViewCell {
2929

3030
self.checkmarkView.isHidden = !self.isSelected
3131
}
32-
3332
}

Others/Config.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Config: NSObject {
4646
ThemeModel(name: "Midnight Black", color: Colors.black, appIcon: "IconBlack")]//,
4747
// ThemeModel(name: "True Black", color: Colors.night, appIcon: "IconNight")]
4848

49-
static let languages = [LanguageModel(name: "English".localized(), code: "en_US"), LanguageModel(name: "Romanian".localized(), code: "ro_RO"), LanguageModel(name: "Traditional Chinese".localized(), code: "zh_TW")]
49+
static let languages = [LanguageModel(name: "LANGUAGE_OPTION_1".localized(), code: "en_US"), LanguageModel(name: "LANGUAGE_OPTION_2".localized(), code: "ro_RO"), LanguageModel(name: "LANGUAGE_OPTION_3".localized(), code: "zh_TW")]
5050

5151
static let linksOptions = ["CONFIG_LINK_PREF1".localized(), "CONFIG_LINK_PREF2".localized()]
5252
static let startPageTitles = ["CONFIG_OPTIONS_PREF1".localized(), "CONFIG_OPTIONS_PREF2".localized(), "CONFIG_OPTIONS_PREF3".localized(), "CONFIG_OPTIONS_PREF4".localized(), "CONFIG_OPTIONS_PREF5".localized(), "CONFIG_OPTIONS_PREF6".localized(), "CONFIG_OPTIONS_PREF7".localized()]

Others/OnboardingDataSource.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ enum OnboardingDataSource {
6161
}
6262

6363
static func makeIntroPage() -> FeedbackPageBLTNItem {
64-
let page = FeedbackPageBLTNItem(title: "Welcome to\n".localized() + Config.General.appName)
64+
let page = FeedbackPageBLTNItem(title: "ONBOARDING_WELCOME".localized() + Config.General.appName)
6565
page.image = UIImage(named: "roundedIcon")
6666

6767
page.appearance = self.getAppearance()
6868

69-
page.descriptionText = "Let's start with a quick onboarding".localized()
70-
page.actionButtonTitle = "Continue".localized()
69+
page.descriptionText = "ONBOARDING_START".localized()
70+
page.actionButtonTitle = "ONBOARDING_CONTINUE".localized()
7171

7272
page.isDismissable = false
7373

@@ -87,14 +87,14 @@ enum OnboardingDataSource {
8787
}
8888

8989
static func makeNotitificationsPage() -> FeedbackPageBLTNItem {
90-
let page = FeedbackPageBLTNItem(title: "Push Notifications".localized())
90+
let page = FeedbackPageBLTNItem(title: "ONBOARDING_PUSH_NOTIFICATIONS".localized())
9191
page.image = UIImage(named: "NotificationPrompt")
9292

9393
page.appearance = self.getAppearance()
9494

95-
page.descriptionText = "Receive push notifications for reminders".localized()
96-
page.actionButtonTitle = "Activate".localized()
97-
page.alternativeButtonTitle = "Not now".localized()
95+
page.descriptionText = "ONBOARDING_RECEIVE_PUSH_NOTIFICATIONS".localized()
96+
page.actionButtonTitle = "ONBOARDING_ACTIVATE".localized()
97+
page.alternativeButtonTitle = "ONBOARDING_NOT_NOW".localized()
9898

9999
page.isDismissable = false
100100

@@ -113,7 +113,7 @@ enum OnboardingDataSource {
113113
}
114114

115115
static func makeCompletionPage() -> BLTNPageItem {
116-
let page = BLTNPageItem(title: "Onboarding done".localized())
116+
let page = BLTNPageItem(title: "ONBOARDING_DONE".localized())
117117
page.image = UIImage(named: "IntroCompletion")
118118

119119
page.appearance = self.getAppearance()
@@ -129,8 +129,8 @@ enum OnboardingDataSource {
129129

130130
page.appearance.actionButtonTitleColor = .white
131131

132-
page.descriptionText = "Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!".localized()
133-
page.actionButtonTitle = "Get started".localized()
132+
page.descriptionText = "ONBOARDING_DONE_DETAIL".localized()
133+
page.actionButtonTitle = "ONBOARDING_DONE_ACTION".localized()
134134

135135
page.isDismissable = true
136136

Others/en.lproj/Localizable.strings

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@
115115
"EDIT" = "Edit";
116116
"SAVE" = "Save";
117117

118-
// OnboardingDataSource
119-
"Welcome to" = "Welcome to";
120-
"Let's start with a quick onboarding" = "Let's start with a quick onboarding";
121-
"Continue" = "Continue";
122-
"Push Notifications" = "Push Notifications";
123-
"Receive push notifications for reminders" = "Receive push notifications for reminders";
124-
"Activate" = "Activate";
125-
"Not now" = "Not now";
126-
"Onboarding done" = "Onboarding done";
127-
"Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!" = "Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!";
128-
"Get started" = "Get started";
118+
// Onboarding
119+
"ONBOARDING_WELCOME" = "Welcome to\n";
120+
"ONBOARDING_START" = "Let's start with a quick onboarding";
121+
"ONBOARDING_CONTINUE" = "Continue";
122+
"ONBOARDING_PUSH_NOTIFICATIONS" = "Push Notifications";
123+
"ONBOARDING_RECEIVE_PUSH_NOTIFICATIONS" = "Receive push notifications for reminders";
124+
"ONBOARDING_ACTIVATE" = "Activate";
125+
"ONBOARDING_NOT_NOW" = "Not now";
126+
"ONBOARDING_DONE" = "Onboarding done";
127+
"ONBOARDING_DONE_DETAIL" = "Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!";
128+
"ONBOARDING_DONE_ACTION" = "Get started";
129129

130-
//Language options
131-
"English" = "English";
132-
"Romanian" = "Romanian";
133-
"Traditional Chinese" = "Traditional Chinese";
130+
// Language options (used in config)
131+
"LANGUAGE_OPTION_1" = "English";
132+
"LANGUAGE_OPTION_2" = "Romanian";
133+
"LANGUAGE_OPTION_3" = "Traditional Chinese";

Others/ro.lproj/Localizable.strings

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@
115115
"EDIT" = "Editare";
116116
"SAVE" = "Salvați";
117117

118-
// OnboardingDataSource
119-
"Welcome to" = "Welcome to";
120-
"Let's start with a quick onboarding" = "Let's start with a quick onboarding";
121-
"Continue" = "Continue";
122-
"Push Notifications" = "Push Notifications";
123-
"Receive push notifications for reminders" = "Receive push notifications for reminders";
124-
"Activate" = "Activate";
125-
"Not now" = "Not now";
126-
"Onboarding done" = "Onboarding done";
127-
"Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!" = "Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!";
128-
"Get started" = "Get started";
118+
// Onboarding
119+
"ONBOARDING_WELCOME" = "Bun venit la\n";
120+
"ONBOARDING_START" = "Să începem cu o mică introducere";
121+
"ONBOARDING_CONTINUE" = "Continuă";
122+
"ONBOARDING_PUSH_NOTIFICATIONS" = "Push Notifications";
123+
"ONBOARDING_RECEIVE_PUSH_NOTIFICATIONS" = "Primește notificări push pentru memento-uri";
124+
"ONBOARDING_ACTIVATE" = "Activează";
125+
"ONBOARDING_NOT_NOW" = "Nu acum";
126+
"ONBOARDING_DONE" = "Setări inițiale finalizate";
127+
"ONBOARDING_DONE_DETAIL" = "Verifică și ecranul de setări de unde poți modifica tema de culoare și altele! Acum poți începe să adaugi sarcini!";
128+
"ONBOARDING_DONE_ACTION" = "Să începem";
129129

130-
//Language options
131-
"English" = "English";
132-
"Romanian" = "Romanian";
133-
"Traditional Chinese" = "Traditional Chinese";
130+
// Language options (used in config)
131+
"LANGUAGE_OPTION_1" = "Engleză";
132+
"LANGUAGE_OPTION_2" = "Română";
133+
"LANGUAGE_OPTION_3" = "Chineză";

Others/zh-Hant.lproj/Localizable.strings

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@
115115
"EDIT" = "編輯";
116116
"SAVE" = "存檔";
117117

118-
// OnboardingDataSource
119-
"Welcome to\n" = "歡迎使用";
120-
"Let's start with a quick onboarding" = "讓我們從快速入門開始";
121-
"Continue" = "繼續";
122-
"Push Notifications" = "通知";
123-
"Receive push notifications for reminders" = "接收提醒的通知";
124-
"Activate" = "啟用";
125-
"Not now" = "不是現在";
126-
"Onboarding done" = "快速入門完成";
127-
"Check out settings where you can customize the color theme for the app and other relevat preferences. You can now add tasks and plan your day!" = "檢查您可以自訂app顏色主題的設定及其他相關設定。您可以現在增加事項及計畫您的一天";
128-
"Get started" = "開始";
118+
// Onboarding
119+
"ONBOARDING_WELCOME" = "歡迎使用";
120+
"ONBOARDING_START" = "讓我們從快速入門開始";
121+
"ONBOARDING_CONTINUE" = "繼續";
122+
"ONBOARDING_PUSH_NOTIFICATIONS" = "通知";
123+
"ONBOARDING_RECEIVE_PUSH_NOTIFICATIONS" = "接收提醒的通知";
124+
"ONBOARDING_ACTIVATE" = "啟用";
125+
"ONBOARDING_NOT_NOW" = "不是現在";
126+
"ONBOARDING_DONE" = "快速入門完成";
127+
"ONBOARDING_DONE_DETAIL" = "檢查您可以自訂app顏色主題的設定及其他相關設定。您可以現在增加事項及計畫您的一天!";
128+
"ONBOARDING_DONE_ACTION" = "開始";
129129

130-
//Language options
131-
"English" = "英文";
132-
"Romanian" = "羅馬尼亞文";
133-
"Traditional Chinese" = "繁體中文";
130+
// Language options (used in config)
131+
"LANGUAGE_OPTION_1" = "英文";
132+
"LANGUAGE_OPTION_2" = "羅馬尼亞文";
133+
"LANGUAGE_OPTION_3" = "繁體中文";

Podfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- AcknowList (1.9.3)
2+
- AcknowList (1.9.4)
33
- ActionSheetPicker-3.0 (2.3.1)
44
- ActiveLabel (1.1.0)
55
- BulletinBoard (4.1.0)
@@ -8,20 +8,20 @@ PODS:
88
- Fabric (1.10.2)
99
- IceCream (1.13.0):
1010
- RealmSwift
11-
- ImageViewer.swift (3.0.10):
11+
- ImageViewer.swift (3.0.12):
1212
- SDWebImage
1313
- LKAlertController (1.12.2)
1414
- Loaf (0.5.0)
15-
- Realm (4.3.0):
16-
- Realm/Headers (= 4.3.0)
17-
- Realm/Headers (4.3.0)
18-
- RealmSwift (4.3.0):
19-
- Realm (= 4.3.0)
15+
- Realm (4.4.1):
16+
- Realm/Headers (= 4.4.1)
17+
- Realm/Headers (4.4.1)
18+
- RealmSwift (4.4.1):
19+
- Realm (= 4.4.1)
2020
- Robin (0.1.1)
2121
- RSTextViewMaster (2.1.2)
22-
- SDWebImage (5.5.0):
23-
- SDWebImage/Core (= 5.5.0)
24-
- SDWebImage/Core (5.5.0)
22+
- SDWebImage (5.7.4):
23+
- SDWebImage/Core (= 5.7.4)
24+
- SDWebImage/Core (5.7.4)
2525
- UnderKeyboard (13.0.2)
2626

2727
DEPENDENCIES:
@@ -73,23 +73,23 @@ CHECKOUT OPTIONS:
7373
:git: https://github.com/rursache/IceCream.git
7474

7575
SPEC CHECKSUMS:
76-
AcknowList: a3ee7cfba2c45cf9d07d1b18fe729a5bcc518366
76+
AcknowList: a236060b8c33141d7756814fd21d5dab477fc193
7777
ActionSheetPicker-3.0: e011a1ab5c4db15eae954582c5a5a7d959be1dac
7878
ActiveLabel: 5e3f4de79a1952d4604b845a0610d4776e4b82b3
7979
BulletinBoard: c774340545b5cfd05a96a89f63b105ecc95c86f9
8080
Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
8181
Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
8282
IceCream: 1689e1952bd526922293c283a5938e8183e9e177
83-
ImageViewer.swift: 9bff2405a5c0a523092a8c031a7bf80c1433e7f4
83+
ImageViewer.swift: d4769c57ff8aef6da7e01bb9283f8554469b2498
8484
LKAlertController: 10c7e8627e5d4757d03b4f53469f35ded14c378f
8585
Loaf: 0800b444431366bc395d54267975d4ad4ad5c99c
86-
Realm: 9357c3589555793e1860a7104a7412bca4a48d99
87-
RealmSwift: 402f1e379a8ef82c635313037b043f0f06de880c
86+
Realm: 4eb04d7487bd43c0581256f40b424eafb711deff
87+
RealmSwift: 3eb8924ff7100df5928c7602f71d0fec51e7c9c5
8888
Robin: 59dacf9ece2546b76a93967a4e0c6cbd55db2939
8989
RSTextViewMaster: 21b31d2c702b062cfcc4ead4fca0643e9d4a638f
90-
SDWebImage: 86589f0d47a7de15827640c71813e23fd428965c
90+
SDWebImage: 48b88379b798fd1e4298f95bb25d2cdabbf4deb3
9191
UnderKeyboard: 79ea6feb497af99c1856aaae0ab8ded3c739f745
9292

9393
PODFILE CHECKSUM: 3bf2cf4dabac8cbd717132525efef77a1e217f2e
9494

95-
COCOAPODS: 1.8.4
95+
COCOAPODS: 1.9.1

Storyboards/Base.lproj/Main.storyboard

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Xpc-PX-jlA">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Xpc-PX-jlA">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>

0 commit comments

Comments
 (0)