Adds new strings to Strings class

OneBusAway · Apr 13, 2020 · 5c9a603 · 5c9a603
1 parent a43cdbd
commit 5c9a603
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 71 deletions.
diff --git a/OBAKit/Bookmarks/AddBookmarkViewController.swift b/OBAKit/Bookmarks/AddBookmarkViewController.swift
@@ -35,7 +35,7 @@ class AddBookmarkViewController: OperationController<StopArrivalsModelOperation,
 
         navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
 
-        title = OBALoc("add_bookmark_controller.title", value: "Add Bookmark", comment: "Title for the Add Bookmark view controller.")
+        title = Strings.addBookmark
     }
 
     // MARK: - UIViewController

diff --git a/OBAKit/Bookmarks/EditBookmarkViewController.swift b/OBAKit/Bookmarks/EditBookmarkViewController.swift
@@ -35,7 +35,7 @@ class EditBookmarkViewController: FormViewController, AddGroupAlertDelegate {
         super.init(nibName: nil, bundle: nil)
 
         if self.bookmark == nil {
-            title = OBALoc("edit_bookmark_controller.title_add", value: "Add Bookmark", comment: "Title for the Edit Bookmark controller in add mode")
+            title = Strings.addBookmark
         }
         else {
             title = OBALoc("edit_bookmark_controller.title_edit", value: "Edit Bookmark", comment: "Title for the Edit Bookmark controller in edit mode")

diff --git a/OBAKit/PushNotifications/AlarmBuilderViewController.swift b/OBAKit/PushNotifications/AlarmBuilderViewController.swift
@@ -141,7 +141,7 @@ class AlarmTimePickerItem: BLTNPageItem {
 
         descriptionText = OBALoc("alarm_time_picker.description", value: "Remind me when this vehicle will depart in:", comment: "Explains what the Alarm Time Picker page does.")
         isDismissable = true
-        actionButtonTitle = OBALoc("alarm_time_picker.action_button_title", value: "Add Alarm", comment: "Title of the button on the alarm time picker page.")
+        actionButtonTitle = Strings.addAlarm
     }
 
     override func makeViewsUnderDescription(with interfaceBuilder: BLTNInterfaceBuilder) -> [UIView]? {

diff --git a/OBAKit/Settings/SettingsViewController.swift b/OBAKit/Settings/SettingsViewController.swift
@@ -126,7 +126,7 @@ class SettingsViewController: FormViewController {
 
         section <<< SwitchRow {
             $0.tag = privacySectionReportingEnabled
-            $0.title = OBALoc("settings_controller.prviacy_section.reporting_enabled", value: "Send usage data to developer", comment: "Settings > Privacy section > Send usage data")
+            $0.title = OBALoc("settings_controller.privacy_section.reporting_enabled", value: "Send usage data to developer", comment: "Settings > Privacy section > Send usage data")
         }
 
         return section

diff --git a/OBAKit/Strings/en.lproj/Localizable.strings b/OBAKit/Strings/en.lproj/Localizable.strings
@@ -12,9 +12,6 @@
 /* Text for the table header for bookmarking an individual trip. */
 "add_bookmark_controller.bookmark_trip_header" = "Bookmark a Trip";
 
-/* Title for the Add Bookmark view controller. */
-"add_bookmark_controller.title" = "Add Bookmark";
-
 /* Text field placeholder on the Add Group Alert. */
 "add_group_alert.placeholder" = "Bookmark Group Title";
 
@@ -33,9 +30,6 @@
 /* One minute/1 minute */
 "alarm_builder_controller.one_minute" = "1 minute";
 
-/* Title of the button on the alarm time picker page. */
-"alarm_time_picker.action_button_title" = "Add Alarm";
-
 /* Explains what the Alarm Time Picker page does. */
 "alarm_time_picker.description" = "Remind me when this vehicle will depart in:";
 
@@ -81,9 +75,6 @@
 /* Don't add this bookmark to a group. */
 "edit_bookmark_controller.no_group_row" = "(No Group)";
 
-/* Title for the Edit Bookmark controller in add mode */
-"edit_bookmark_controller.title_add" = "Add Bookmark";
-
 /* Title for the Edit Bookmark controller in edit mode */
 "edit_bookmark_controller.title_edit" = "Edit Bookmark";
 
@@ -367,13 +358,7 @@
 "settings_controller.privacy_section.title" = "Privacy";
 
 /* Settings > Privacy section > Send usage data */
-"settings_controller.prviacy_section.reporting_enabled" = "Send usage data to developer";
-
-/* Action sheet button title for adding an alarm. */
-"stop_controller.add_alarm" = "Add Alarm";
-
-/* Action sheet button title for adding a bookmark */
-"stop_controller.add_bookmark" = "Add Bookmark";
+"settings_controller.privacy_section.reporting_enabled" = "Send usage data to developer";
 
 /* A message that appears when a user's alarm is created. */
 "stop_controller.alarm_created_message" = "Alarm created";

diff --git a/OBAKit/Strings/fr-CA.lproj/Localizable.strings b/OBAKit/Strings/fr-CA.lproj/Localizable.strings
@@ -12,9 +12,6 @@
 /* Text for the table header for bookmarking an individual trip. */
 "add_bookmark_controller.bookmark_trip_header" = "Bookmark a Trip";
 
-/* Title for the Add Bookmark view controller. */
-"add_bookmark_controller.title" = "Add Bookmark";
-
 /* Text field placeholder on the Add Group Alert. */
 "add_group_alert.placeholder" = "Bookmark Group Title";
 
@@ -33,9 +30,6 @@
 /* One minute/1 minute */
 "alarm_builder_controller.one_minute" = "1 minute";
 
-/* Title of the button on the alarm time picker page. */
-"alarm_time_picker.action_button_title" = "Add Alarm";
-
 /* Explains what the Alarm Time Picker page does. */
 "alarm_time_picker.description" = "Remind me when this vehicle will depart in:";
 
@@ -87,9 +81,6 @@
 /* Don't add this bookmark to a group. */
 "edit_bookmark_controller.no_group_row" = "(No Group)";
 
-/* Title for the Edit Bookmark controller in add mode */
-"edit_bookmark_controller.title_add" = "Add Bookmark";
-
 /* Title for the Edit Bookmark controller in edit mode */
 "edit_bookmark_controller.title_edit" = "Edit Bookmark";
 
@@ -373,13 +364,7 @@
 "settings_controller.privacy_section.title" = "Privacy";
 
 /* Settings > Privacy section > Send usage data */
-"settings_controller.prviacy_section.reporting_enabled" = "Send usage data to developer";
-
-/* Action sheet button title for adding an alarm. */
-"stop_controller.add_alarm" = "Add Alarm";
-
-/* Action sheet button title for adding a bookmark */
-"stop_controller.add_bookmark" = "Add Bookmark";
+"settings_controller.privacy_section.reporting_enabled" = "Send usage data to developer";
 
 /* A message that appears when a user's alarm is created. */
 "stop_controller.alarm_created_message" = "Alarm created";
@@ -402,9 +387,6 @@
 /* The header for the Service Alerts section of the stops controller. */
 "stop_controller.service_alerts_header" = "Service Alerts";
 
-/* Action sheet button title for sharing the status of your trip (i.e. location, arrival time, etc.) */
-"stop_controller.share_trip" = "Share Trip";
-
 /* Title of the Routes section */
 "stop_preferences_controller.routes_section.header_title" = "Routes";
 

diff --git a/OBAKit/Strings/pl.lproj/Localizable.strings b/OBAKit/Strings/pl.lproj/Localizable.strings
@@ -12,9 +12,6 @@
 /* Text for the table header for bookmarking an individual trip. */
 "add_bookmark_controller.bookmark_trip_header" = "Dodaj kurs do zakładek";
 
-/* Title for the Add Bookmark view controller. */
-"add_bookmark_controller.title" = "Dodaj zakładkę";
-
 /* Text field placeholder on the Add Group Alert. */
 "add_group_alert.placeholder" = "Bookmark Group Title";
 
@@ -33,9 +30,6 @@
 /* One minute/1 minute */
 "alarm_builder_controller.one_minute" = "1 minuta";
 
-/* Title of the button on the alarm time picker page. */
-"alarm_time_picker.action_button_title" = "Dodaj alarm";
-
 /* Explains what the Alarm Time Picker page does. */
 "alarm_time_picker.description" = "Przypomnij mi kiedy ten pojazd odjeżdża za:";
 
@@ -81,9 +75,6 @@
 /* Don't add this bookmark to a group. */
 "edit_bookmark_controller.no_group_row" = "(Bez grupy)";
 
-/* Title for the Edit Bookmark controller in add mode */
-"edit_bookmark_controller.title_add" = "Dodaj zakładkę";
-
 /* Title for the Edit Bookmark controller in edit mode */
 "edit_bookmark_controller.title_edit" = "Edytuj zakładkę";
 
@@ -361,13 +352,7 @@
 "settings_controller.privacy_section.title" = "Prywatność";
 
 /* Settings > Privacy section > Send usage data */
-"settings_controller.prviacy_section.reporting_enabled" = "Wyślij dane użycia do dewelopera";
-
-/* Action sheet button title for adding an alarm. */
-"stop_controller.add_alarm" = "Dodaj alarm";
-
-/* Action sheet button title for adding a bookmark */
-"stop_controller.add_bookmark" = "Dodaj zakładkę";
+"settings_controller.privacy_section.reporting_enabled" = "Wyślij dane użycia do dewelopera";
 
 /* A message that appears when a user's alarm is created. */
 "stop_controller.alarm_created_message" = "Utworzono alarm";
@@ -390,9 +375,6 @@
 /* The header for the Service Alerts section of the stops controller. */
 "stop_controller.service_alerts_header" = "Komunikaty o stanie sieci";
 
-/* Action sheet button title for sharing the status of your trip (i.e. location, arrival time, etc.) */
-"stop_controller.share_trip" = "Share Trip";
-
 /* Title of the Routes section */
 "stop_preferences_controller.routes_section.header_title" = "Linie";
 

diff --git a/OBAKitCore/Strings/Strings.swift b/OBAKitCore/Strings/Strings.swift
@@ -10,6 +10,10 @@ import Foundation
 
 public class Strings: NSObject {
 
+    public static let addAlarm = OBALoc("common.add_alarm", value: "Add Alarm", comment: "This will appear on a button or as a title, and indicates that this UI will create a new bookmark.")
+
+    public static let addBookmark = OBALoc("common.add_bookmark", value: "Add Bookmark", comment: "This will appear on a button or as a title, and indicates that this UI will create a new bookmark.")
+
     public static let alarm = OBALoc("common.alarm", value: "Alarm", comment: "The noun, like an alarm clock or an alarm bell.")
 
     public static let back = OBALoc("common.back", value: "Back", comment: "Back, as in 'back to the previous screen.'")
@@ -56,6 +60,8 @@ public class Strings: NSObject {
 
     public static let settings = OBALoc("common.settings", value: "Settings", comment: "A noun referring to a collection of options for adjusting app behavior.")
 
+    public static let shareTrip = OBALoc("common.share_trip", value: "Share Trip", comment: "Button title for sharing the status of your trip (i.e. location, arrival time, etc.)")
+
     public static let skip = OBALoc("common.skip", value: "Skip", comment: "The verb 'to skip' as in 'don't perform a particular step and go on to the next one instead.'")
 
     public static let stops = OBALoc("common.stops", value: "Stops", comment: "Noun. Plural form of a transit stop.")

diff --git a/Translations/OBAKit.txt b/Translations/OBAKit.txt
@@ -53,12 +53,6 @@
 		pl = 1 minuta
 		fr = 
 		es =  
-	[alarm_time_picker.action_button_title]
-		en = Add Alarm
-		comment = Title of the button on the alarm time picker page.
-		pl = Dodaj alarm
-		fr = 
-		es =  
 	[alarm_time_picker.description]
 		en = Remind me when this vehicle will depart in:
 		comment = Explains what the Alarm Time Picker page does.
@@ -717,7 +711,7 @@
 		pl = Prywatność
 		fr = 
 		es =  
-	[settings_controller.prviacy_section.reporting_enabled]
+	[settings_controller.privacy_section.reporting_enabled]
 		en = Send usage data to developer
 		comment = Settings > Privacy section > Send usage data
 		pl = Wyślij dane użycia do dewelopera
@@ -777,12 +771,6 @@
 		pl = Komunikaty o stanie sieci
 		fr = 
 		es =  
-	[stop_controller.share_trip]
-		en = Share Trip
-		comment = Action sheet button title for sharing the status of your trip (i.e. location, arrival time, etc.)
-		pl = Share Trip
-		fr = 
-		es =  
 	[stop_preferences_controller.routes_section.header_title]
 		en = Routes
 		comment = Title of the Routes section

diff --git a/Translations/OBAKitCore.txt b/Translations/OBAKitCore.txt
@@ -1,4 +1,16 @@
 [[OBAKitCore]]
+	[common.add_alarm]
+		en = Add Alarm
+		comment = This will appear on a button or as a title, and indicates that this UI will create a new bookmark.
+		pl = Dodaj alarm
+		fr = 
+		es =
+	[common.add_bookmark]
+		en = Add Bookmark
+		comment = This will appear on a button or as a title, and indicates that this UI will create a new bookmark.
+		pl = Dodaj zakładkę
+		fr = 
+		es =
 	[common.back]
 		en = Back
 		comment = Back, as in 'back to the previous screen.'
@@ -131,6 +143,12 @@
 		pl = Ustawienia
 		fr = 
 		es =  
+	[common.share_trip]
+		en = Share Trip
+		comment = Button title for sharing the status of your trip (i.e. location, arrival time, etc.)
+		pl = 
+		fr = 
+		es = 
 	[common.skip]
 		en = Skip
 		comment = The verb 'to skip' as in 'don't perform a particular step and go on to the next one instead.'