diff --git a/HabitRPG/Generated/Storyboard Scenes.swift b/HabitRPG/Generated/Storyboard Scenes.swift index 5476eed2a..bd7e32bf9 100644 --- a/HabitRPG/Generated/Storyboard Scenes.swift +++ b/HabitRPG/Generated/Storyboard Scenes.swift @@ -16,171 +16,171 @@ internal enum StoryboardScene { internal enum BuyModal: StoryboardType { internal static let storyboardName = "BuyModal" - internal static let initialScene = InitialSceneType(storyboard: BuyModal.self) + internal static let initialScene = InitialSceneType(storyboard: BuyModal.self) - internal static let hrpgBuyItemModalViewController = SceneType(storyboard: BuyModal.self, identifier: "HRPGBuyItemModalViewController") + internal static let hrpgBuyItemModalViewController = SceneType(storyboard: BuyModal.self, identifier: "HRPGBuyItemModalViewController") } internal enum Intro: StoryboardType { internal static let storyboardName = "Intro" - internal static let initialScene = InitialSceneType(storyboard: Intro.self) + internal static let initialScene = InitialSceneType(storyboard: Intro.self) - internal static let loginTableViewController = SceneType(storyboard: Intro.self, identifier: "LoginTableViewController") + internal static let loginTableViewController = SceneType(storyboard: Intro.self, identifier: "LoginTableViewController") } internal enum Main: StoryboardType { internal static let storyboardName = "Main" - internal static let aboutViewController = SceneType(storyboard: Main.self, identifier: "AboutViewController") + internal static let aboutViewController = SceneType(storyboard: Main.self, identifier: "AboutViewController") internal static let adventureGuideNavigationViewController = SceneType(storyboard: Main.self, identifier: "AdventureGuideNavigationViewController") - internal static let adventureGuideViewController = SceneType(storyboard: Main.self, identifier: "AdventureGuideViewController") + internal static let adventureGuideViewController = SceneType(storyboard: Main.self, identifier: "AdventureGuideViewController") - internal static let avatarOverviewViewController = SceneType(storyboard: Main.self, identifier: "AvatarOverviewViewController") + internal static let avatarOverviewViewController = SceneType(storyboard: Main.self, identifier: "AvatarOverviewViewController") - internal static let dailiesViewController = SceneType(storyboard: Main.self, identifier: "DailiesViewController") + internal static let dailiesViewController = SceneType(storyboard: Main.self, identifier: "DailiesViewController") - internal static let equipmentOverviewViewController = SceneType(storyboard: Main.self, identifier: "EquipmentOverviewViewController") + internal static let equipmentOverviewViewController = SceneType(storyboard: Main.self, identifier: "EquipmentOverviewViewController") - internal static let gemPurchaseViewController = SceneType(storyboard: Main.self, identifier: "GemPurchaseViewController") + internal static let gemPurchaseViewController = SceneType(storyboard: Main.self, identifier: "GemPurchaseViewController") - internal static let giftGemsNavController = SceneType(storyboard: Main.self, identifier: "GiftGemsNavController") + internal static let giftGemsNavController = SceneType(storyboard: Main.self, identifier: "GiftGemsNavController") - internal static let giftSubscriptionNavController = SceneType(storyboard: Main.self, identifier: "GiftSubscriptionNavController") + internal static let giftSubscriptionNavController = SceneType(storyboard: Main.self, identifier: "GiftSubscriptionNavController") - internal static let giftSubscriptionViewController = SceneType(storyboard: Main.self, identifier: "GiftSubscriptionViewController") + internal static let giftSubscriptionViewController = SceneType(storyboard: Main.self, identifier: "GiftSubscriptionViewController") - internal static let habitsViewController = SceneType(storyboard: Main.self, identifier: "HabitsViewController") + internal static let habitsViewController = SceneType(storyboard: Main.self, identifier: "HabitsViewController") internal static let itemNavigationController = SceneType(storyboard: Main.self, identifier: "ItemNavigationController") - internal static let itemsViewController = SceneType(storyboard: Main.self, identifier: "ItemsViewController") + internal static let itemsViewController = SceneType(storyboard: Main.self, identifier: "ItemsViewController") internal static let mainSplitViewController = SceneType(storyboard: Main.self, identifier: "MainSplitViewController") - internal static let mainTabBarController = SceneType(storyboard: Main.self, identifier: "MainTabBarController") + internal static let mainTabBarController = SceneType(storyboard: Main.self, identifier: "MainTabBarController") - internal static let mountDetailViewController = SceneType(storyboard: Main.self, identifier: "MountDetailViewController") + internal static let mountDetailViewController = SceneType(storyboard: Main.self, identifier: "MountDetailViewController") - internal static let mountsOverviewViewController = SceneType(storyboard: Main.self, identifier: "MountsOverviewViewController") + internal static let mountsOverviewViewController = SceneType(storyboard: Main.self, identifier: "MountsOverviewViewController") - internal static let newsViewController = SceneType(storyboard: Main.self, identifier: "NewsViewController") + internal static let newsViewController = SceneType(storyboard: Main.self, identifier: "NewsViewController") - internal static let notificationsNavigationController = SceneType(storyboard: Main.self, identifier: "NotificationsNavigationController") + internal static let notificationsNavigationController = SceneType(storyboard: Main.self, identifier: "NotificationsNavigationController") - internal static let petDetailViewController = SceneType(storyboard: Main.self, identifier: "PetDetailViewController") + internal static let petDetailViewController = SceneType(storyboard: Main.self, identifier: "PetDetailViewController") - internal static let petsOverviewViewController = SceneType(storyboard: Main.self, identifier: "PetsOverviewViewController") + internal static let petsOverviewViewController = SceneType(storyboard: Main.self, identifier: "PetsOverviewViewController") internal static let promoWebNavController = SceneType(storyboard: Main.self, identifier: "PromoWebNavController") - internal static let promoWebViewController = SceneType(storyboard: Main.self, identifier: "PromoWebViewController") + internal static let promoWebViewController = SceneType(storyboard: Main.self, identifier: "PromoWebViewController") internal static let promotionInfoNavController = SceneType(storyboard: Main.self, identifier: "PromotionInfoNavController") - internal static let promotionInfoViewController = SceneType(storyboard: Main.self, identifier: "PromotionInfoViewController") + internal static let promotionInfoViewController = SceneType(storyboard: Main.self, identifier: "PromotionInfoViewController") internal static let purchaseGemNavController = SceneType(storyboard: Main.self, identifier: "PurchaseGemNavController") - internal static let rewardsViewController = SceneType(storyboard: Main.self, identifier: "RewardsViewController") + internal static let rewardsViewController = SceneType(storyboard: Main.self, identifier: "RewardsViewController") internal static let spellUserNavigationController = SceneType(storyboard: Main.self, identifier: "SpellUserNavigationController") - internal static let stableViewController = SceneType(storyboard: Main.self, identifier: "StableViewController") + internal static let stableViewController = SceneType(storyboard: Main.self, identifier: "StableViewController") internal static let subscriptionNavController = SceneType(storyboard: Main.self, identifier: "SubscriptionNavController") internal static let taskBoardViewController = SceneType(storyboard: Main.self, identifier: "TaskBoardViewController") - internal static let todosViewController = SceneType(storyboard: Main.self, identifier: "TodosViewController") + internal static let todosViewController = SceneType(storyboard: Main.self, identifier: "TodosViewController") - internal static let avatarDetailViewController = SceneType(storyboard: Main.self, identifier: "avatarDetailViewController") + internal static let avatarDetailViewController = SceneType(storyboard: Main.self, identifier: "avatarDetailViewController") - internal static let oldAvatarDetailViewController = SceneType(storyboard: Main.self, identifier: "oldAvatarDetailViewController") + internal static let oldAvatarDetailViewController = SceneType(storyboard: Main.self, identifier: "oldAvatarDetailViewController") internal static let spellTaskNavigationController = SceneType(storyboard: Main.self, identifier: "spellTaskNavigationController") - internal static let tagNavigationController = SceneType(storyboard: Main.self, identifier: "tagNavigationController") + internal static let tagNavigationController = SceneType(storyboard: Main.self, identifier: "tagNavigationController") } internal enum Settings: StoryboardType { internal static let storyboardName = "Settings" - internal static let initialScene = InitialSceneType(storyboard: Settings.self) + internal static let initialScene = InitialSceneType(storyboard: Settings.self) internal static let classSelectionNavigationController = SceneType(storyboard: Settings.self, identifier: "ClassSelectionNavigationController") } internal enum Shop: StoryboardType { internal static let storyboardName = "Shop" - internal static let shopViewController = SceneType(storyboard: Shop.self, identifier: "ShopViewController") + internal static let shopViewController = SceneType(storyboard: Shop.self, identifier: "ShopViewController") } internal enum Social: StoryboardType { internal static let storyboardName = "Social" - internal static let challengeDetailViewController = SceneType(storyboard: Social.self, identifier: "ChallengeDetailViewController") + internal static let challengeDetailViewController = SceneType(storyboard: Social.self, identifier: "ChallengeDetailViewController") - internal static let challengeNavigationViewController = SceneType(storyboard: Social.self, identifier: "ChallengeNavigationViewController") + internal static let challengeNavigationViewController = SceneType(storyboard: Social.self, identifier: "ChallengeNavigationViewController") - internal static let challengeTableViewController = SceneType(storyboard: Social.self, identifier: "ChallengeTableViewController") + internal static let challengeTableViewController = SceneType(storyboard: Social.self, identifier: "ChallengeTableViewController") - internal static let groupChatViewController = SceneType(storyboard: Social.self, identifier: "GroupChatViewController") + internal static let groupChatViewController = SceneType(storyboard: Social.self, identifier: "GroupChatViewController") - internal static let groupTableViewController = SceneType(storyboard: Social.self, identifier: "GroupTableViewController") + internal static let groupTableViewController = SceneType(storyboard: Social.self, identifier: "GroupTableViewController") - internal static let guidelinesNavigationViewController = SceneType(storyboard: Social.self, identifier: "GuidelinesNavigationViewController") + internal static let guidelinesNavigationViewController = SceneType(storyboard: Social.self, identifier: "GuidelinesNavigationViewController") - internal static let guidelinesViewController = SceneType(storyboard: Social.self, identifier: "GuidelinesViewController") + internal static let guidelinesViewController = SceneType(storyboard: Social.self, identifier: "GuidelinesViewController") - internal static let guildsOverviewViewController = SceneType(storyboard: Social.self, identifier: "GuildsOverviewViewController") + internal static let guildsOverviewViewController = SceneType(storyboard: Social.self, identifier: "GuildsOverviewViewController") - internal static let inboxChatNavigationController = SceneType(storyboard: Social.self, identifier: "InboxChatNavigationController") + internal static let inboxChatNavigationController = SceneType(storyboard: Social.self, identifier: "InboxChatNavigationController") - internal static let inboxChatViewController = SceneType(storyboard: Social.self, identifier: "InboxChatViewController") + internal static let inboxChatViewController = SceneType(storyboard: Social.self, identifier: "InboxChatViewController") - internal static let inboxNavigationViewController = SceneType(storyboard: Social.self, identifier: "InboxNavigationViewController") + internal static let inboxNavigationViewController = SceneType(storyboard: Social.self, identifier: "InboxNavigationViewController") - internal static let inboxViewController = SceneType(storyboard: Social.self, identifier: "InboxViewController") + internal static let inboxViewController = SceneType(storyboard: Social.self, identifier: "InboxViewController") - internal static let partyNavigationViewController = SceneType(storyboard: Social.self, identifier: "PartyNavigationViewController") + internal static let partyNavigationViewController = SceneType(storyboard: Social.self, identifier: "PartyNavigationViewController") - internal static let partyViewController = SceneType(storyboard: Social.self, identifier: "PartyViewController") + internal static let partyViewController = SceneType(storyboard: Social.self, identifier: "PartyViewController") - internal static let questDetailViewController = SceneType(storyboard: Social.self, identifier: "QuestDetailViewController") + internal static let questDetailViewController = SceneType(storyboard: Social.self, identifier: "QuestDetailViewController") internal static let userProfileNavController = SceneType(storyboard: Social.self, identifier: "UserProfileNavController") - internal static let userProfileViewController = SceneType(storyboard: Social.self, identifier: "UserProfileViewController") + internal static let userProfileViewController = SceneType(storyboard: Social.self, identifier: "UserProfileViewController") } internal enum Support: StoryboardType { internal static let storyboardName = "Support" - internal static let initialScene = InitialSceneType(storyboard: Support.self) + internal static let initialScene = InitialSceneType(storyboard: Support.self) - internal static let faqDetailViewController = SceneType(storyboard: Support.self, identifier: "FAQDetailViewController") + internal static let faqDetailViewController = SceneType(storyboard: Support.self, identifier: "FAQDetailViewController") - internal static let faqViewController = SceneType(storyboard: Support.self, identifier: "FAQViewController") + internal static let faqViewController = SceneType(storyboard: Support.self, identifier: "FAQViewController") - internal static let mainSupportViewController = SceneType(storyboard: Support.self, identifier: "MainSupportViewController") + internal static let mainSupportViewController = SceneType(storyboard: Support.self, identifier: "MainSupportViewController") - internal static let reportBugViewController = SceneType(storyboard: Support.self, identifier: "ReportBugViewController") + internal static let reportBugViewController = SceneType(storyboard: Support.self, identifier: "ReportBugViewController") } internal enum Tasks: StoryboardType { internal static let storyboardName = "Tasks" internal static let taskDetailViewController = SceneType(storyboard: Tasks.self, identifier: "TaskDetailViewController") - internal static let taskFormViewController = SceneType(storyboard: Tasks.self, identifier: "TaskFormViewController") + internal static let taskFormViewController = SceneType(storyboard: Tasks.self, identifier: "TaskFormViewController") } internal enum User: StoryboardType { internal static let storyboardName = "User" - internal static let achievementsCollectionViewController = SceneType(storyboard: User.self, identifier: "AchievementsCollectionViewController") + internal static let achievementsCollectionViewController = SceneType(storyboard: User.self, identifier: "AchievementsCollectionViewController") - internal static let attributePointsViewController = SceneType(storyboard: User.self, identifier: "AttributePointsViewController") + internal static let attributePointsViewController = SceneType(storyboard: User.self, identifier: "AttributePointsViewController") - internal static let spellsViewController = SceneType(storyboard: User.self, identifier: "SpellsViewController") + internal static let spellsViewController = SceneType(storyboard: User.self, identifier: "SpellsViewController") - internal static let verifyUsernameModalViewController = SceneType(storyboard: User.self, identifier: "VerifyUsernameModalViewController") + internal static let verifyUsernameModalViewController = SceneType(storyboard: User.self, identifier: "VerifyUsernameModalViewController") } } // swiftlint:enable explicit_type_interface identifier_name line_length prefer_self_in_static_references diff --git a/HabitRPG/Generated/Strings.swift b/HabitRPG/Generated/Strings.swift index 6ee642752..3096c8772 100644 --- a/HabitRPG/Generated/Strings.swift +++ b/HabitRPG/Generated/Strings.swift @@ -62,6 +62,8 @@ public enum L10n { public static var beastMasterTitle: String { return L10n.tr("Mainstrings", "beastMasterTitle") } /// Beginner Objectives public static var beginnerObjectives: String { return L10n.tr("Mainstrings", "beginner_objectives") } + /// Birthday + public static var birthday: String { return L10n.tr("Mainstrings", "birthday") } /// Celebrate Habitica’s 10th birthday with gifts and exclusive items below! public static var birthdayHeaderDescription: String { return L10n.tr("Mainstrings", "birthday_header_description") } /// This is a limited time event that starts on %s and will end %s. The Limited Edition Jubilant Gryphatrice and ten Magic Hatching Potions will be available to buy during this time. The other Gifts listed in the Four for Free section will be automatically delivered to all accounts that were active in the 30 days prior to day the gift is sent. Accounts created after the gifts are sent will not be able to claim them. @@ -778,6 +780,8 @@ public enum L10n { public static var notRecurring: String { return L10n.tr("Mainstrings", "not_recurring") } /// Notes public static var notes: String { return L10n.tr("Mainstrings", "notes") } + /// New Year's + public static var nye: String { return L10n.tr("Mainstrings", "nye") } /// OK public static var ok: String { return L10n.tr("Mainstrings", "ok") } /// Onboarding Tasks @@ -1202,6 +1206,8 @@ public enum L10n { public static var triadBingoTitle: String { return L10n.tr("Mainstrings", "triadBingoTitle") } /// Tuesday public static var tuesday: String { return L10n.tr("Mainstrings", "tuesday") } + /// Turkey Day + public static var turkeyDay: String { return L10n.tr("Mainstrings", "turkey_day") } /// +2 Gems each month public static var twoGemsPerMonth: String { return L10n.tr("Mainstrings", "two_gems_per_month") } /// Two-Handed @@ -1286,6 +1292,8 @@ public enum L10n { public static func usuallyXGems(_ p1: Int) -> String { return L10n.tr("Mainstrings", "usually_x_gems", p1) } + /// Valentines + public static var valentines: String { return L10n.tr("Mainstrings", "valentines") } /// View Achievements public static var viewAchievements: String { return L10n.tr("Mainstrings", "view_achievements") } /// View Gem Bundles diff --git a/HabitRPG/Strings/Base.lproj/Mainstrings.strings b/HabitRPG/Strings/Base.lproj/Mainstrings.strings index 12858f82a..d3aa14d7e 100644 --- a/HabitRPG/Strings/Base.lproj/Mainstrings.strings +++ b/HabitRPG/Strings/Base.lproj/Mainstrings.strings @@ -1391,6 +1391,10 @@ "summer" = "Summer"; "fall" = "Fall"; "winter" = "Winter"; +"nye" = "New Year's"; +"birthday" = "Birthday"; +"valentines" = "Valentines"; +"turkey_day" = "Turkey Day"; "customization_shop" = "Customization Shop"; "class_equipment_shop_dialog" = "This item is only available to %s.\nOpen Settings to change class."; diff --git a/HabitRPG/UI/General/MainMenuViewController.swift b/HabitRPG/UI/General/MainMenuViewController.swift index 61ee0c3a6..d1288208d 100644 --- a/HabitRPG/UI/General/MainMenuViewController.swift +++ b/HabitRPG/UI/General/MainMenuViewController.swift @@ -428,6 +428,16 @@ class MainMenuViewController: BaseTableViewController { seasonText = L10n.summer case "fall": seasonText = L10n.fall + case "nye": + seasonText = L10n.nye + case "birthday": + seasonText = L10n.birthday + case "valentines": + seasonText = L10n.valentines + case "habitoween": + seasonText = "Habitoween" + case "thanksgiving": + seasonText = L10n.turkeyDay default: seasonText = L10n.isOpen }