From 87092e81095c57911b7a87e37a713e0bd531d82c Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 3 Dec 2014 22:19:33 -0600 Subject: [PATCH 1/4] Added mystic hourglass and time travelers screens --- locales/en/subscriber.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/en/subscriber.json b/locales/en/subscriber.json index c88a117021..00a3254066 100644 --- a/locales/en/subscriber.json +++ b/locales/en/subscriber.json @@ -60,5 +60,8 @@ "checkout": "Checkout", "buySubsText": "Buy gems with Gold, No Ads, Support the Devs", "sureCancelSub": "Are you sure you want to cancel your subscription?", - "subCanceled": "Subscription will become inactive on" + "subCanceled": "Subscription will become inactive on", + "timeTravelersTitle": "Mysterious Time Travelers", + "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", + "mysticHourglassPopover": "Mystic Hourglass allow you to purchase previous months' subscriber sets." } From 2e2faa611783d62c6cce35600e23fc267283395d Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 3 Dec 2014 22:24:43 -0600 Subject: [PATCH 2/4] Moved pre-subscription time travelers title and popover to shared --- locales/en/subscriber.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locales/en/subscriber.json b/locales/en/subscriber.json index 00a3254066..70012da8df 100644 --- a/locales/en/subscriber.json +++ b/locales/en/subscriber.json @@ -61,7 +61,9 @@ "buySubsText": "Buy gems with Gold, No Ads, Support the Devs", "sureCancelSub": "Are you sure you want to cancel your subscription?", "subCanceled": "Subscription will become inactive on", + "timeTravelersTitleNoSub": "Tyler and Vicky", "timeTravelersTitle": "Mysterious Time Travelers", + "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! Subscribers earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "mysticHourglassPopover": "Mystic Hourglass allow you to purchase previous months' subscriber sets." } From a55fa37412c0dc1e32565630519c58b3453eae27 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 3 Dec 2014 22:46:41 -0600 Subject: [PATCH 3/4] Converted strings to be able to use links --- locales/en/subscriber.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/locales/en/subscriber.json b/locales/en/subscriber.json index 70012da8df..b424570e0f 100644 --- a/locales/en/subscriber.json +++ b/locales/en/subscriber.json @@ -63,7 +63,11 @@ "subCanceled": "Subscription will become inactive on", "timeTravelersTitleNoSub": "Tyler and Vicky", "timeTravelersTitle": "Mysterious Time Travelers", - "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! Subscribers earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", - "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", + "timeTravelersPopoverNoSub1": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! ", + "timeTravelersPopoverNoSub2": "Subscribers", + "timeTravelersPopoverNoSub3": "earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", + "timeTravelersPopover1": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets", + "timeTravelersPopover2": "here", + "timeTravelersPopover3": "! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "mysticHourglassPopover": "Mystic Hourglass allow you to purchase previous months' subscriber sets." } From 6dac81f850df8fdee929bcc7be8d405775a6d1a6 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Thu, 4 Dec 2014 20:03:17 -0600 Subject: [PATCH 4/4] Corrected strings so they only used on variable --- locales/en/subscriber.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/locales/en/subscriber.json b/locales/en/subscriber.json index b424570e0f..7cbb7a6016 100644 --- a/locales/en/subscriber.json +++ b/locales/en/subscriber.json @@ -63,11 +63,7 @@ "subCanceled": "Subscription will become inactive on", "timeTravelersTitleNoSub": "Tyler and Vicky", "timeTravelersTitle": "Mysterious Time Travelers", - "timeTravelersPopoverNoSub1": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! ", - "timeTravelersPopoverNoSub2": "Subscribers", - "timeTravelersPopoverNoSub3": "earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", - "timeTravelersPopover1": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets", - "timeTravelersPopover2": "here", - "timeTravelersPopover3": "! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", + "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", + "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets <%= linkStart %>here<%= linkEnd %>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "mysticHourglassPopover": "Mystic Hourglass allow you to purchase previous months' subscriber sets." }