From f767d82af7b961761fd357caf99bb35d79a2669a Mon Sep 17 00:00:00 2001 From: Andrey Savchenko Date: Sun, 7 Dec 2014 21:41:07 +0200 Subject: [PATCH 1/8] Translated strings in ladder section to Ukrainian --- app/locale/uk.coffee | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index 909c80838..e4a7bde2e 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -725,15 +725,15 @@ module.exports = nativeDescription: "Українська", englishDescription: helpful_ambassadors: "Наші незамінні Посланці:" ladder: -# please_login: "Please log in first before playing a ladder game." + please_login: "Будь ласка увійдіть до вашого акаунта перед грою у драбині." my_matches: "Мої поєдинки" -# simulate: "Simulate" -# simulation_explanation: "By simulating games you can get your game ranked faster!" -# simulate_games: "Simulate Games!" -# simulate_all: "RESET AND SIMULATE GAMES" -# games_simulated_by: "Games simulated by you:" -# games_simulated_for: "Games simulated for you:" -# games_simulated: "Games simulated" + simulate: "Моделювати" + simulation_explanation: "Моделюючи ігри ви можете швидше отримати оцінку вашої гри!" + simulate_games: "Моделювати ігри!" + simulate_all: "ЗБРОСИТИ ТА МОДЕЛЮВАТИ ІГРИ" + games_simulated_by: "Ігор модельовано вами:" + games_simulated_for: "Ігор модельовано для вас:" + games_simulated: "Ігор модельовано" games_played: "Ігор зіграно" ratio: "Співвідношення" leaderboard: "Таблиця лідерів" @@ -742,40 +742,40 @@ module.exports = nativeDescription: "Українська", englishDescription: summary_matches: "Поєдинки - " summary_wins: " Перемоги, " summary_losses: " Поразки" -# rank_no_code: "No New Code to Rank" -# rank_my_game: "Rank My Game!" + rank_no_code: "Нема нового коду для оцінки" + rank_my_game: "Оцінити мою гру!" rank_submitting: "Відправлення..." -# rank_submitted: "Submitted for Ranking" -# rank_failed: "Failed to Rank" -# rank_being_ranked: "Game Being Ranked" -# rank_last_submitted: "submitted " -# help_simulate: "Help simulate games?" -# code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in." -# no_ranked_matches_pre: "No ranked matches for the " -# no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked." + rank_submitted: "Відправлено для оцінки" + rank_failed: "Не вдалося оцінити" + rank_being_ranked: "Гра оцінюється" + rank_last_submitted: "відправлено " + help_simulate: "Допомогти моделювати ігри?" + code_being_simulated: "Ваш новий код моделюється іншими гравцями для оцінки. Буде обновлюватися із новими матчами." + no_ranked_matches_pre: "Немає нових матчей для " + no_ranked_matches_post: " команди! Зіграйте проти супротивників та поверніться для отримання оцінки вашої гри." choose_opponent: "Оберіть противника" select_your_language: "Оберіть мову!" -# tutorial_play: "Play Tutorial" + tutorial_play: "Пройти навчання" tutorial_recommended: "Рекомендовано, якщо ви взагалі раніше не грали" -# tutorial_skip: "Skip Tutorial" -# tutorial_not_sure: "Not sure what's going on?" -# tutorial_play_first: "Play the Tutorial first." + tutorial_skip: "Пропустити навчання" + tutorial_not_sure: "Не впевнені що відбувається?" + tutorial_play_first: "Спочатку пройти навчання." simple_ai: "Простий ШІ" -# warmup: "Warmup" -# friends_playing: "Friends Playing" -# log_in_for_friends: "Log in to play with your friends!" -# social_connect_blurb: "Connect and play against your friends!" -# invite_friends_to_battle: "Invite your friends to join you in battle!" + warmup: "Розігрів" + friends_playing: "Дружня гра" + log_in_for_friends: "Увійдіть та грайте за вашими друзями!" + social_connect_blurb: "Приєднайтесь та грайте проти ваших друзів!" + invite_friends_to_battle: "Завітайте ваших друзів приєднатися до вас у бою!" fight: "В бій!" -# watch_victory: "Watch your victory" -# defeat_the: "Defeat the" -# tournament_ends: "Tournament ends" -# tournament_ended: "Tournament ended" -# tournament_rules: "Tournament Rules" + watch_victory: "Подивитись вашу перемогу" + defeat_the: "Перемогти" + tournament_ends: "Турнір завершуються" + tournament_ended: "Турнір завершено" + tournament_rules: "Правила турніру" # tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details" # tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details" -# tournament_blurb_blog: "on our blog" -# rules: "Rules" + tournament_blurb_blog: "у нашому блозі" + rules: "Правила" winners: "Переможці" user: From 3deef7f5da2e232601e4334435b2116314557efb Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Sun, 7 Dec 2014 21:32:09 -0800 Subject: [PATCH 2/8] Turning off signup title and description A/B tests These have been on a long time. Using short title and no description. Data from Mixpanel: Description on: no 42.09 yes 41.91 Title length: short 42.26 long 41.74 --- app/locale/en.coffee | 2 -- app/templates/core/auth.jade | 8 +------- app/views/core/AuthModal.coffee | 5 ----- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index aac19b3e9..6ca9c6829 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -111,8 +111,6 @@ signup_switch: "Want to create an account?" signup: - create_account_title: "Create Account to Save Progress" - description: "It's free. Just need a couple things and you'll be good to go:" email_announcements: "Receive announcements by email" creating: "Creating Account..." sign_up: "Sign Up" diff --git a/app/templates/core/auth.jade b/app/templates/core/auth.jade index f537b0228..331cdc8a8 100644 --- a/app/templates/core/auth.jade +++ b/app/templates/core/auth.jade @@ -9,10 +9,7 @@ if mode === 'login' h1(data-i18n="login.log_in") Log In if mode === 'signup' - if title === 'short' - h1(data-i18n="login.sign_up") Create Account - else - h1(data-i18n="signup.create_account_title").long-title Create Account to Save Progress + h1(data-i18n="login.sign_up") Create Account div#close-modal span.glyphicon.glyphicon-remove @@ -24,9 +21,6 @@ .alert.alert-success span(data-i18n="signup.required") You need to log in before you can that way. - else if mode === 'signup' && descriptionOn === "yes" - p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go: - form.form .form-group label.control-label(for="email") diff --git a/app/views/core/AuthModal.coffee b/app/views/core/AuthModal.coffee index 515110418..ca0a88470 100644 --- a/app/views/core/AuthModal.coffee +++ b/app/views/core/AuthModal.coffee @@ -33,11 +33,6 @@ module.exports = class AuthModal extends ModalView getRenderData: -> c = super() c.showRequiredError = @options.showRequiredError - c.title = {0: 'short', 1: 'long'}[me.get('testGroupNumber') % 2] - c.descriptionOn = {0: 'yes', 1: 'no'}[Math.floor(me.get('testGroupNumber')/2) % 2] - if @mode is 'signup' - application.tracker.identify authModalTitle: c.title - application.tracker.trackEvent 'Started Signup', authModalTitle: c.title, descriptionOn: c.descriptionOn c.mode = @mode c.formValues = @previousFormInputs or {} c.me = me From fee328212df546c5e1f1151210cf0aa0e1a3965c Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Sun, 7 Dec 2014 22:44:20 -0800 Subject: [PATCH 3/8] Add missing signup tracking data And add level to subscription tracking data where appropriate. --- app/views/core/RootView.coffee | 12 +++++++++++- app/views/play/WorldMapView.coffee | 2 +- app/views/play/level/ControlBarView.coffee | 5 +++++ app/views/play/level/LevelLoadingView.coffee | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/views/core/RootView.coffee b/app/views/core/RootView.coffee index 462d99931..922f6f0ae 100644 --- a/app/views/core/RootView.coffee +++ b/app/views/core/RootView.coffee @@ -52,7 +52,17 @@ module.exports = class RootView extends CocoView onClickSignupButton: -> AuthModal = require 'views/core/AuthModal' - window.tracker?.trackEvent 'Sign Up', category: 'Homepage', ['Google Analytics'] if @id is 'home-view' + switch @id + when 'home-view' + window.tracker?.trackEvent 'Started Signup', category: 'Homepage', label: 'Homepage' + window.tracker?.trackPageView "signup/homepage", ['Google Analytics'] + when 'world-map-view' + # TODO: add campaign data + window.tracker?.trackEvent 'Started Signup', category: 'World Map', label: 'World Map' + window.tracker?.trackPageView "signup/world-map", ['Google Analytics'] + else + window.tracker?.trackEvent 'Started Signup', label: 'unknown' + window.tracker?.trackPageView "signup/unknown", ['Google Analytics'] @openModalView new AuthModal {mode: 'signup'} onClickLoginButton: -> diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index 024064e1e..3cb2df9ce 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -219,7 +219,7 @@ module.exports = class WorldMapView extends RootView else if level.requiresSubscription and @requiresSubscription and not @levelStatusMap[level.id] and not level.adventurer @openModalView new SubscribeModal() - window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'map level clicked' + window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'map level clicked', level: levelID window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] else if $(e.target).attr('disabled') Backbone.Mediator.publish 'router:navigate', route: '/contribute/adventurer' diff --git a/app/views/play/level/ControlBarView.coffee b/app/views/play/level/ControlBarView.coffee index b092f6196..95fb9f202 100644 --- a/app/views/play/level/ControlBarView.coffee +++ b/app/views/play/level/ControlBarView.coffee @@ -26,6 +26,7 @@ module.exports = class ControlBarView extends CocoView 'click .levels-link-area': 'onClickHome' 'click .home a': 'onClickHome' 'click .multiplayer-area': 'onClickMultiplayer' + 'click #control-bar-sign-up-button': 'onClickSignupButton' constructor: (options) -> @worldName = options.worldName @@ -95,6 +96,10 @@ module.exports = class ControlBarView extends CocoView onClickMultiplayer: (e) -> @openModalView new GameMenuModal showTab: 'multiplayer', level: @level, session: @session, supermodel: @supermodel + onClickSignupButton: -> + window.tracker?.trackEvent 'Started Signup', category: 'Play Level', label: 'Control Bar', level: @levelID + window.tracker?.trackPageView "signup/play-level", ['Google Analytics'] + onDisableControls: (e) -> @toggleControls e, false onEnableControls: (e) -> @toggleControls e, true toggleControls: (e, enabled) -> diff --git a/app/views/play/level/LevelLoadingView.coffee b/app/views/play/level/LevelLoadingView.coffee index 8b1fbd49c..3c45d6ab4 100644 --- a/app/views/play/level/LevelLoadingView.coffee +++ b/app/views/play/level/LevelLoadingView.coffee @@ -110,7 +110,7 @@ module.exports = class LevelLoadingView extends CocoView onClickStartSubscription: (e) -> @openModalView new SubscribeModal() - window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'level loading' + window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'level loading', level: @options.level ? 'unknown' window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] onSubscribed: -> From 8f5e82c54a973af6d925d480f3d4d71a3f631bf3 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Sun, 7 Dec 2014 23:53:04 -0800 Subject: [PATCH 4/8] Update subscribe copy To be more inline with free track + subscription practice/bonus levels. --- app/locale/en.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 6ca9c6829..bd2683d7a 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -335,7 +335,7 @@ subscribe: subscribe_title: "Subscribe" - levels: "Unlock 17 extra levels! With 5 new ones every week!" + levels: "Get more practice with bonus levels!" heroes: "More powerful heroes!" gems: "3500 bonus gems every month!" items: "Over 250 bonus items!" From 6860419352d73b01984244c6fa7c19dc5669fca0 Mon Sep 17 00:00:00 2001 From: Krasnov Ehor Date: Mon, 8 Dec 2014 10:30:40 +0200 Subject: [PATCH 5/8] Update uk.coffee --- app/locale/uk.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index 909c80838..855d81b2f 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -495,7 +495,7 @@ module.exports = nativeDescription: "Українська", englishDescription: email_any_notes_description: "Вимкніть аби заборонити сповіщення на email." email_news: "Новини" email_recruit_notes: "Ваканція роботи" -# email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." + email_recruit_notes_description: "Якщо ти граеш дуже добре, ми можемо запропонувати тобі (кращу) роботу." contributor_emails: "Підписки за класами учасників" contribute_prefix: "Нам потрібні люди, які приєднаються до нашої команди! Зайдіть на " contribute_page: "сторінку учасників," From a96cd4f3c0212beda60c09c580851b65e507ba6a Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Mon, 8 Dec 2014 08:50:12 +0000 Subject: [PATCH 6/8] Update payments-view.jade --- app/templates/account/payments-view.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/account/payments-view.jade b/app/templates/account/payments-view.jade index 8b1e6e1d0..74ac159af 100644 --- a/app/templates/account/payments-view.jade +++ b/app/templates/account/payments-view.jade @@ -14,7 +14,7 @@ block content button.end-subscription-button.btn.btn-lg.btn-warning(data-i18n="subscribe.unsubscribe") Unsubscribe .payment-status(data-i18n="account.status_subscribed") else if !me.isAnonymous() - button.start-subscription-button.btn.btn-lg.btn-success(data-i18n="subscribe.subscribe") Subscribe + button.start-subscription-button.btn.btn-lg.btn-success(data-i18n="subscribe.subscribe_title") Subscribe if active .payment-status(data-i18n="account.status_unsubscribed_active") else From 9655d6992e30ce5e94a7160e2fef190ec6cf5814 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Mon, 8 Dec 2014 08:52:14 +0000 Subject: [PATCH 7/8] Update en.coffee --- app/locale/en.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index bd2683d7a..6322894cc 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -335,6 +335,7 @@ subscribe: subscribe_title: "Subscribe" + unsubscribe: "Unsubscribe" levels: "Get more practice with bonus levels!" heroes: "More powerful heroes!" gems: "3500 bonus gems every month!" From 74b426ffbf1a5c8f58f685bfef861572dea771de Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 8 Dec 2014 06:24:46 -0800 Subject: [PATCH 8/8] Fixed #1875. --- app/styles/play/modal/buy-gems-modal.sass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/styles/play/modal/buy-gems-modal.sass b/app/styles/play/modal/buy-gems-modal.sass index 7ffef0fa3..8552cc411 100644 --- a/app/styles/play/modal/buy-gems-modal.sass +++ b/app/styles/play/modal/buy-gems-modal.sass @@ -25,10 +25,11 @@ .product width: 228px - overflow: none + height: 136px float: left text-align: center margin-right: 12px + position: relative h4 font-size: 20px @@ -40,7 +41,10 @@ color: rgb(22,16,5) button + position: absolute width: 80% + left: 10% + bottom: -30px //- Errors