From c2eb11367286ab765889ff95233fbe6aaf7498a0 Mon Sep 17 00:00:00 2001 From: AccioBooks Date: Thu, 29 Sep 2016 06:57:44 -0500 Subject: [PATCH] Make Wikia Links Translatable (#7036) * Wikia Links * Update contrib.json (Added comma) * Implement @Alys's Suggestions * conLearnLink -> conLearnURL * add link to plans.jade * Appended "URL" to locale strings with URLs * Add 's' --- .../client-old/js/services/guideServices.js | 4 ++-- website/common/locales/en/challenge.json | 1 + .../common/locales/en/communityGuidelines.json | 2 +- website/common/locales/en/contrib.json | 4 +++- website/common/locales/en/front.json | 6 +++--- website/common/locales/en/generic.json | 5 ++++- website/common/locales/en/groups.json | 6 ++++-- website/common/locales/en/npc.json | 4 ++-- website/views/options/inventory/pets.jade | 2 +- .../views/options/social/challenge-box.jade | 2 +- website/views/options/social/challenges.jade | 2 +- website/views/options/social/tavern.jade | 18 ++++++++---------- website/views/shared/footer.jade | 6 +++--- website/views/shared/header/menu.jade | 4 ++-- website/views/shared/mixins.jade | 6 ------ website/views/shared/modals/achievements.jade | 2 +- .../views/shared/profiles/achievements.jade | 3 ++- website/views/static/community-guidelines.jade | 2 +- website/views/static/plans.jade | 6 +++--- 19 files changed, 43 insertions(+), 42 deletions(-) diff --git a/website/client-old/js/services/guideServices.js b/website/client-old/js/services/guideServices.js index fbe034e819..2552755e06 100644 --- a/website/client-old/js/services/guideServices.js +++ b/website/client-old/js/services/guideServices.js @@ -82,11 +82,11 @@ function($rootScope, User, $timeout, $state, Analytics) { }, { element: ".meter.mana", title: window.env.t('spells'), - content: window.env.t('spellsText') + " " + window.env.t('toDo') + "." + content: window.env.t('spellsText') }, { orphan: true, title: window.env.t('readMore'), - content: window.env.t('moreClass') + " Wikia.", + content: window.env.t('moreClass'), final: true } ] diff --git a/website/common/locales/en/challenge.json b/website/common/locales/en/challenge.json index b1768dee67..382190b2df 100644 --- a/website/common/locales/en/challenge.json +++ b/website/common/locales/en/challenge.json @@ -11,6 +11,7 @@ "unsubChallenge": "Broken Challenge Link: this task was part of a challenge, but you have unsubscribed from the challenge. What to do with the orphan tasks?", "challengeWinner": "Was the winner in the following challenges", "challenges": "Challenges", + "challengesLink": "Challenges", "noChallenges": "No challenges yet, visit", "toCreate": "to create one.", "selectWinner": "Select a winner and close the challenge:", diff --git a/website/common/locales/en/communityGuidelines.json b/website/common/locales/en/communityGuidelines.json index feffb3b022..ae2cb43fd7 100644 --- a/website/common/locales/en/communityGuidelines.json +++ b/website/common/locales/en/communityGuidelines.json @@ -169,7 +169,7 @@ "commGuideLink01description": "a guild for new users to ask questions!", "commGuideLink02": "The Back Corner Guild", "commGuideLink02description": "a guild for the discussion of long or sensitive topics.", - "commGuideLink03": "The Wiki", + "commGuideLink03": "The Wiki", "commGuideLink03description": "the biggest collection of information about Habitica.", "commGuideLink04": "GitHub", "commGuideLink04description": "for bug reports or helping code programs!", diff --git a/website/common/locales/en/contrib.json b/website/common/locales/en/contrib.json index f05e2f10e7..f00382d04a 100644 --- a/website/common/locales/en/contrib.json +++ b/website/common/locales/en/contrib.json @@ -54,8 +54,10 @@ "playerTiers": "Player Tiers", "tier": "Tier", "visitHeroes": "Visit the Hall of Heroes (contributors and backers)", - "conLearn": "Learn more about contributor rewards", + "conLearn": "Learn more about contributor rewards", "conLearnHow": "Learn how to contribute to Habitica", + "conLearnURL": "http://habitica.wikia.com/wiki/Contributing_to_Habitica", + "conRewardsURL": "http://habitica.wikia.com/wiki/Contributor_Rewards", "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Current Survey", diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json index 5489bfafa5..76ca31857f 100644 --- a/website/common/locales/en/front.json +++ b/website/common/locales/en/front.json @@ -20,17 +20,17 @@ "chores": "Chores", "clearBrowserData": "Clear Browser Data", "communityBug": "Submit Bug", - "communityExtensions": "Add-ons & Extensions", + "communityExtensions": "Add-ons & Extensions", "communityFacebook": "Facebook", "communityFeature": "Request Feature", - "communityForum": "Forum", + "communityForum": "Forum", "communityKickstarter": "Kickstarter", "communityReddit": "Reddit", "companyAbout": "How it Works", "companyBlog": "Blog", "devBlog": "Developer Blog", "companyDonate": "Donate", - "companyExtensions": "Extensions", + "companyExtensions": "Extensions", "companyPrivacy": "Privacy", "companyTerms": "Terms", "companyVideos": "Videos", diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index cc62205611..cb46a19867 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -3,7 +3,8 @@ "stringNotFound": "String '<%= string %>' not found.", "titleIndex": "Habitica | Your Life The Role Playing Game", "habitica": "Habitica", - + "habiticaLink": "Habitica", + "titleTasks": "Tasks", "titleAvatar": "Avatar", "titleBackgrounds": "Backgrounds", @@ -77,6 +78,8 @@ "gems": "Gems", "gemButton": "You have <%= number %> Gems.", "moreInfo": "More Info", + "moreInfoChallengesURL": "http://habitica.wikia.com/wiki/Challenges", + "moreInfoTagsURL": "http://habitica.wikia.com/wiki/Tags", "showMoreMore": "(show more)", "showMoreLess": "(show less)", "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.", diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index c925ab569c..4330aafc0d 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -6,11 +6,12 @@ "innTextBroken": "You're resting in the Inn, I guess... While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day... If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies... unless they are also in the Inn... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn... so tired...", "lfgPosts": "Looking for Group (Party Wanted) Posts", "tutorial": "Tutorial", - "glossary": "Glossary", + "glossary": "Glossary", "wiki": "Wiki", + "wikiLink": "Wiki", "reportAP": "Report a Problem", "requestAF": "Request a Feature", - "community": "Community Forum", + "community": "Community Forum", "dataTool": "Data Display Tool", "resources": "Resources", "askQuestionNewbiesGuild": "Ask a Question (Newbies Guild)", @@ -73,6 +74,7 @@ "createGuild": "Create Guild", "guild": "Guild", "guilds": "Guilds", + "guildsLink": "Guilds", "sureKick": "Do you really want to remove this member from the party/guild?", "optionalMessage": "Optional message", "yesRemove": "Yes, remove them", diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json index 229ac0632f..9fb79d34eb 100644 --- a/website/common/locales/en/npc.json +++ b/website/common/locales/en/npc.json @@ -65,9 +65,9 @@ "autoAllocate": "Auto Allocate", "autoAllocateText": "If 'automatic allocation' is checked, your avatar gains stats automatically based on your tasks' attributes, which you can find in TASK > Edit > Advanced > Attributes. Eg, if you hit the gym often, and your 'Gym' Daily is set to 'Strength', you'll gain Strength automatically.", "spells": "Spells", - "spellsText": "You can now unlock class-specific spells. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed ", + "spellsText": "You can now unlock class-specific spells. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed To-Do.", "toDo": "To-Do", - "moreClass": "For more information on the class-system, see", + "moreClass": "For more information on the class-system, see Wikia.", "tourWelcome": "Welcome to Habitica! This is your To-Do list. Check off a task to proceed!", "tourExp": "Great job! Checking off a task gives you Experience and Gold!", diff --git a/website/views/options/inventory/pets.jade b/website/views/options/inventory/pets.jade index 7716fb529b..018f66b9f8 100644 --- a/website/views/options/inventory/pets.jade +++ b/website/views/options/inventory/pets.jade @@ -53,7 +53,7 @@ mixin petList(eggSource, potionSource) each t,k in env.Content.specialPets - var egg = k.split('-')[0], pot = k.split('-')[1] button(ng-if='user.items.pets["#{egg}-#{pot}"]', class="pet-button Pet-#{egg}-#{pot}", ng-class='{active: user.items.currentPet == "#{egg}-#{pot}"}', ng-click='choosePet("#{egg}", "#{pot}")', popover=env.t(t), popover-trigger='mouseenter', popover-placement='bottom') - a(target='_blank', href='http://habitica.wikia.com/wiki/Contributing_to_Habitica') + a(target='_blank', href=env.t('conLearnURL')) button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover=env.t('rarePetPop1'), popover-title=env.t('rarePetPop2')) .PixelPaw-Gold diff --git a/website/views/options/social/challenge-box.jade b/website/views/options/social/challenge-box.jade index 177e049e4d..0acc1c8752 100644 --- a/website/views/options/social/challenge-box.jade +++ b/website/views/options/social/challenge-box.jade @@ -3,7 +3,7 @@ .panel-heading h3.panel-title=env.t('challenges') |  - a.pull-right(target='_blank', href='http://habitica.wikia.com/wiki/Challenges') + a.pull-right(target='_blank', href=env.t('moreInfoChallengesURL')) small=env.t('moreInfo') .panel-body.modal-fixed-height(bindonce='group.challenges') div(ng-if='group.challenges.length > 0') diff --git a/website/views/options/social/challenges.jade b/website/views/options/social/challenges.jade index ab84189f6f..a5fa315a1f 100644 --- a/website/views/options/social/challenges.jade +++ b/website/views/options/social/challenges.jade @@ -149,7 +149,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required ng-disabled='insufficientGemsForTavernChallenge()') |  - a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags', + a.hint.vertical-20(target='_blank', href=env.t('moreInfoTagsURL'), popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right') =env.t('moreInfo') diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index cc06b77ed9..baa904d4de 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -39,13 +39,13 @@ a(target='_blank', href='https://vimeo.com/57654086')=env.t('tutorial') tr td - a(target='_blank', href='http://habitica.wikia.com/wiki/FAQ')=env.t('FAQ') + a(target='_blank', href='https://habitica.com/static/FAQ')=env.t('FAQ') tr td - a(target='_blank', href='http://habitica.wikia.com/wiki/Glossary')=env.t('glossary') + !=env.t('glossary') tr td - a(target='_blank', href='http://habitica.wikia.com/')=env.t('wiki') + !=env.t('wikiLink') tr td a(target='_blank', href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html')=env.t('dataTool') @@ -57,7 +57,7 @@ a(target='_blank', href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')= ' ' + env.t('requestAF') tr td - a(target='_blank', href='http://habitica.wikia.com/wiki/Special:Forum')=env.t('community') + !=env.t('community') tr td a(target='_blank', href='https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestionNewbiesGuild') @@ -71,12 +71,10 @@ | =env.t('visitHeroes') |
- | - =env.t('conLearn') - |
- | - =env.t('conLearnHow') - | + !=env.t('conLearn') + br + a(href=env.t('conLearnURL'), target='_blank') + =env.t('conLearnHow') table.table.table-striped.panel-tiers tr td diff --git a/website/views/shared/footer.jade b/website/views/shared/footer.jade index 75c5bf5762..7103b2e717 100644 --- a/website/views/shared/footer.jade +++ b/website/views/shared/footer.jade @@ -29,7 +29,7 @@ footer.footer(ng-controller='FooterCtrl') li a(target='_blank', href='http://blog.habitrpg.com/')=env.t('tumblr') li - a(href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('companyExtensions') + !=env.t('companyExtensions') li a(href='/static/faq/')=env.t('FAQ') li @@ -52,9 +52,9 @@ footer.footer(ng-controller='FooterCtrl') li a(target='_blank', href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('communityFeature') li - a(href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('communityExtensions') + !=env.t('communityExtensions') li - a(target='_blank', href='http://habitica.wikia.com/wiki/Special:Forum')=env.t('communityForum') + !=env.t('communityForum') li a(target='_blank', href='http://www.kickstarter.com/projects/lefnire/habitrpg-mobile')=env.t('communityKickstarter') li diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index a8af0f07d4..acb44bc341 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -68,7 +68,7 @@ nav.toolbar(ng-controller='MenuCtrl') li a(target='_blank' href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('requestAF') li - a(target='_blank' href='http://habitica.wikia.com/wiki/Contributing_to_Habitica')=env.t('contributeToHRPG') + a(target='_blank' href=env.t('conLearnURL'))=env.t('contributeToHRPG') li a(target='_blank' href=env.t('HabiticaWikiFrontPage'))=env.t('HabiticaWiki') ul.toolbar-controls @@ -171,7 +171,7 @@ nav.toolbar(ng-controller='MenuCtrl') li a(target='_blank' href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('requestAF') li - a(target='_blank' href='http://habitica.wikia.com/wiki/Contributing_to_Habitica')=env.t('contributeToHRPG') + a(target='_blank' href=env.t('conLearnURL'))=env.t('contributeToHRPG') li a(target='_blank' href=env.t('HabiticaWikiFrontPage'))=env.t('HabiticaWiki') ul.toolbar-subscribe(ng-if='!user.purchased.plan.customerId') diff --git a/website/views/shared/mixins.jade b/website/views/shared/mixins.jade index 9af18d869e..0529feea2d 100644 --- a/website/views/shared/mixins.jade +++ b/website/views/shared/mixins.jade @@ -6,12 +6,6 @@ mixin gemButton(isGemsModal) .Pet_Currency_Gem2x.Gems =env.t('gemButton', {number: '{{user.balance * 4 | number:0}}'}) -mixin aLink(url, label) - if mobile - a(href="", ng-click="externalLink('#{url}')")= label - else - a(href='#{url}', target='_blank')= label - mixin previewMarkdown(text) .panel.panel-warning .panel-heading=env.t('msgPreviewHeading') diff --git a/website/views/shared/modals/achievements.jade b/website/views/shared/modals/achievements.jade index 537e879f73..b39bbd816e 100644 --- a/website/views/shared/modals/achievements.jade +++ b/website/views/shared/modals/achievements.jade @@ -112,7 +112,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template') h3(style='margin-bottom:0')=env.t('modalContribAchievement') +achievementAvatar('boot',0) !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' ' - a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink') + a(href=env.t('conRewardsURL') target='_blank')=env.t('contribLink') br button.btn.btn-primary(style='margin-top:1em' ng-click='$close()')=env.t('huzzah') +achievementFooter diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 20c1ada268..cf6f35fb3d 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -29,7 +29,8 @@ div(ng-if='::profile.contributor.level || user._id == profile._id') small =env.t('contribText') |  - +aLink('http://habitica.wikia.com/wiki/Contributing_to_Habitica', env.t('readMore')) + a(href=env.t('conLearnURL'), target='_blank') + =env.t('readMore') | . hr diff --git a/website/views/static/community-guidelines.jade b/website/views/static/community-guidelines.jade index fd87bc7d6d..bcbe51a0b0 100644 --- a/website/views/static/community-guidelines.jade +++ b/website/views/static/community-guidelines.jade @@ -336,7 +336,7 @@ block content |:  =env.t('commGuideLink02description') li - a(href='http://habitica.wikia.com/wiki/Habitica_Wiki' target='_blank')=env.t('commGuideLink03') + !=env.t('commGuideLink03') |:  =env.t('commGuideLink03description') li diff --git a/website/views/static/plans.jade b/website/views/static/plans.jade index 5b16dba306..b19daca47c 100644 --- a/website/views/static/plans.jade +++ b/website/views/static/plans.jade @@ -15,15 +15,15 @@ block content p =env.t('indivPlan1') |  - a(href='http://habitica.wikia.com/wiki/Guilds' target='_blank')=env.t('guilds') + !=env.t('guildsLink') = ' ' + env.t('and') + ' ' - a(href='http://habitica.wikia.com/wiki/Challenges' target='_blank')=env.t('challenges') + !=env.t('challengesLink') |  =env.t('indivPlan2') p =env.t('groupText1') |  - a(href='http://habitica.wikia.com/wiki/Habitica' target='_blank')=env.t('habitica') + !=env.t('habiticaLink') |.  =env.t('groupText2')