Skip to content

Commit

Permalink
Merge branch 'GiacomoLaw-10954-wikiafix' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
paglias committed Feb 7, 2019
2 parents 732a46d + b35bd18 commit 2eab8b2
Show file tree
Hide file tree
Showing 465 changed files with 1,839 additions and 1,839 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

# Pull Request

[Please see these instructions for adding a pull request](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API)
[Please see these instructions for adding a pull request](http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API)

# Requesting a feature

Habitica uses [Trello](https://trello.com/b/EpoYEYod/habitica) to track feature requests. [Read more](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents).

# Contributing Code

See [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29)
See [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29)
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[//]: # (Note: See http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API for more info)
[//]: # (Note: See http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API for more info)

[//]: # (Put Issue # here, if applicable. This will automatically close the issue if your PR is merged in)
Fixes put_#_and_issue_numer_here
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=dev

We need more programmers! Your assistance will be greatly appreciated.

For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths).
For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths).

To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).
To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).
2 changes: 1 addition & 1 deletion VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ minimal dependencies on the developer's local platform. It can be used
on a variety of systems including Windows, Mac OS X, and Linux.

Instructions for using the Habitica Vagrant environment are in
[Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).
[Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const Timer = require('./utils/timer');
const connectToDb = require('./utils/connect').connectToDb;
const closeDb = require('./utils/connect').closeDb;

const message = '`This party\'s collection quest has been made easier! For details, refer to http://habitica.wikia.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';
const message = '`This party\'s collection quest has been made easier! For details, refer to http://habitica.fandom.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';

const timer = new Timer();

Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).
For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).
2 changes: 1 addition & 1 deletion vagrant_scripts/vagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ apt-get install -qq ntp
echo Installing nvm, node and global node modules...
/vagrant/vagrant_scripts/install_node.sh

echo "'vagrant up' is finished. Continue with the instructions at http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally"
echo "'vagrant up' is finished. Continue with the instructions at http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally"

# Uncomment both lines to autostart the habitica server when provisioning
# echo Starting Habitica server...
Expand Down
4 changes: 2 additions & 2 deletions website/client/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Running
For information about installing and running Habitica locally, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).
For information about installing and running Habitica locally, see [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).

# Preparation Reading
- Vue 2 (https://vuejs.org)
Expand All @@ -18,4 +18,4 @@ The project is developed directly in the `develop` branch as long as we'll be ab

So far most of the work has been on the template, so there's no complex logic to understand. The only thing I would suggest you to read about is Vuex for data management: it's basically a Flux implementation: there's a central store that hold the data for the entire app, and every change to the data must happen through an action, the data cannot be mutated directly.

For further resources, see [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths), and in particular the ["Website Technology Stack" section](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths#Website_Technology_Stack).
For further resources, see [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths), and in particular the ["Website Technology Stack" section](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths#Website_Technology_Stack).
2 changes: 1 addition & 1 deletion website/client/components/achievements/newStuff.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.modal-body
.static-view(v-html='html')
.modal-footer
a.btn.btn-info(href='http://habitica.wikia.com/wiki/Whats_New', target='_blank') {{ this.$t('newsArchive') }}
a.btn.btn-info(href='http://habitica.fandom.com/wiki/Whats_New', target='_blank') {{ this.$t('newsArchive') }}
button.btn.btn-secondary(@click='tellMeLater()') {{ this.$t('tellMeLater') }}
button.btn.btn-warning(@click='dismissAlert();') {{ this.$t('dismissAlert') }}
</template>
Expand Down
6 changes: 3 additions & 3 deletions website/client/components/appFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
li
router-link(to='/static/faq') {{ $t('FAQ') }}
li
a(href='http://habitica.wikia.com/wiki/Whats_New', target='_blank') {{ $t('oldNews') }}
a(href='http://habitica.fandom.com/wiki/Whats_New', target='_blank') {{ $t('oldNews') }}
li
router-link(to='/static/merch') {{ $t('merch') }}
li
Expand Down Expand Up @@ -55,7 +55,7 @@
li
a(:href="getDataDisplayToolUrl", target='_blank') {{ $t('dataDisplayTool') }}
li
a(href='http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths', target='_blank') {{ $t('guidanceForBlacksmiths') }}
a(href='http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths', target='_blank') {{ $t('guidanceForBlacksmiths') }}
li
a(href='http://devs.habitica.com/', target='_blank') {{ $t('devBlog') }}
.col-6.social
Expand All @@ -73,7 +73,7 @@
.svg-icon.heart(v-html="icons.heart")
.text {{ $t('companyDonate') }}
.btn.btn-contribute(v-else)
a(href='http://habitica.wikia.com/wiki/Contributing_to_Habitica', target='_blank')
a(href='http://habitica.fandom.com/wiki/Contributing_to_Habitica', target='_blank')
.svg-icon.heart(v-html="icons.heart")
.text {{ $t('companyContribute') }}
.row
Expand Down
2 changes: 1 addition & 1 deletion website/client/components/groups/tavern.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
li
a(href='', v-html="$t('glossary')")
li
a(href='http://habitica.wikia.com/wiki/Habitica_Wiki', v-once) {{ $t('wiki') }}
a(href='http://habitica.fandom.com/wiki/Habitica_Wiki', v-once) {{ $t('wiki') }}
li
a(href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html', v-once) {{ $t('dataDisplayTool') }}
li
Expand Down
4 changes: 2 additions & 2 deletions website/client/components/header/menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ div
router-link.topbar-dropdown-item.dropdown-item(to="/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac") {{ $t('reportBug') }}
router-link.topbar-dropdown-item.dropdown-item(to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a") {{ $t('askAQuestion') }}
a.topbar-dropdown-item.dropdown-item(href="https://trello.com/c/odmhIqyW/440-read-first-table-of-contents", target='_blank') {{ $t('requestAF') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.wikia.com/wiki/Contributing_to_Habitica", target='_blank') {{ $t('contributing') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.wikia.com/wiki/Habitica_Wiki", target='_blank') {{ $t('wiki') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.fandom.com/wiki/Contributing_to_Habitica", target='_blank') {{ $t('contributing') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.fandom.com/wiki/Habitica_Wiki", target='_blank') {{ $t('wiki') }}
a.topbar-dropdown-item.dropdown-item(@click='modForm()') {{ $t('contactForm') }}
.currency-tray.form-inline
.item-with-icon(v-if="userHourglasses > 0")
Expand Down
2 changes: 1 addition & 1 deletion website/client/components/static/faq.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
// linkStart: '[',
// linkEnd: '](/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)',
// },
// "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the <%= linkStart %>Habitica Help guild<%= linkEnd %>! We're happy to help."
// "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), come ask in the <%= linkStart %>Habitica Help guild<%= linkEnd %>! We're happy to help."
};
},
methods: {
Expand Down
2 changes: 1 addition & 1 deletion website/client/components/tasks/taskModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
label.d-flex.align-items-center.justify-content-between(v-once)
span {{ $t('notes') }}
small(v-once)
a(target="_blank", href="http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet") {{ $t('markdownHelpLink') }}
a(target="_blank", href="http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet") {{ $t('markdownHelpLink') }}

textarea.form-control(v-model="task.notes", rows="3")
.task-modal-content(@click="handleClick($event)")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.info {{ $t(bullet) }}
.row
.col-12.text-center
a(href='http://habitica.wikia.com/wiki/World_Bosses' target='_blank').footer-link {{ $t('worldBossLink') }}
a(href='http://habitica.fandom.com/wiki/World_Bosses' target='_blank').footer-link {{ $t('worldBossLink') }}
</template>

<style>
Expand Down
2 changes: 1 addition & 1 deletion website/common/locales/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ request that your changes be translated; changes are automatically
copied to Transifex on a regular basis.

If you want to help with translations, please first read [Guidance for
Linguists](http://habitrpg.wikia.com/wiki/Guidance_for_Linguists) and
Linguists](http://habitica.fandom.com/wiki/Guidance_for_Linguists) and
note especially its information about the [Translations Trello
card](https://trello.com/c/SvTsLdRF/12-translations).
2 changes: 1 addition & 1 deletion website/common/locales/bg/challenge.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"unsubChallenge": "Повредена връзка на предизвикателство: тази задача е била част от предизвикателство, но Вие сте се отписали от него. Какво искате да направите с останалите задачи?",
"challengeWinner": "Беше победител в следните предизвикателства",
"challenges": "Предизвикателства",
"challengesLink": "<a href='http://habitica.wikia.com/wiki/Challenges' target='_blank'>Предизвикателства</a>",
"challengesLink": "<a href='http://habitica.fandom.com/wiki/Challenges' target='_blank'>Предизвикателства</a>",
"challengePrize": "Награда за предизвикателството",
"endDate": "Крайна дата",
"noChallenges": "Все още няма предизвикателства. Посетете",
Expand Down
16 changes: 8 additions & 8 deletions website/common/locales/bg/character.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"costumeText": "Ако предпочитате вида на друго снаряжение пред това, което носите, отметнете кутийката „Използване на костюм“, за да облечете костюм, докато носите бойното си снаряжение отдолу.",
"useCostume": "Използване на костюм",
"useCostumeInfo1": "Натиснете „Използване на костюм“, за да екипирате героя си без да променяте показателите на своето бойно снаряжение! Това означава, че можете да екипирате най-добрите показатели вляво и да облечете героя си с по-добре изглеждаща екипировка вдясно.",
"useCostumeInfo2": "След като натиснете „Използване на костюм“, героят Ви ще изглежда доста обикновен… но не се притеснявайте! Ако погледнете вляво, ще видите, че бойното Ви снаряжение е все още екипирано. След това можете да направите героя си по-интересен! Каквото и да екипирате вдясно, то няма да повлияе на показателите Ви, но може да направи героя Ви да изглежда страхотно. Опитайте различни комбинации, смесвайте комплекти и съчетайте костюма със своите любимци, превози и фонови изображения.<br><br>Имате още въпроси? Разгледайте <a href=\"http://habitica.wikia.com/wiki/Equipment#Costumes\">страницата с костюмите</a> в уикито. Направили сте перфектно съчетание? Изфукайте се в <a href=\"/groups/guild/3884eeaa-2d6a-45e8-a279-ada6de9709e1\">гилдията „Карнавал на костюмите“ (Costume Carnival)</a> или се покажете в кръчмата!",
"useCostumeInfo2": "След като натиснете „Използване на костюм“, героят Ви ще изглежда доста обикновен… но не се притеснявайте! Ако погледнете вляво, ще видите, че бойното Ви снаряжение е все още екипирано. След това можете да направите героя си по-интересен! Каквото и да екипирате вдясно, то няма да повлияе на показателите Ви, но може да направи героя Ви да изглежда страхотно. Опитайте различни комбинации, смесвайте комплекти и съчетайте костюма със своите любимци, превози и фонови изображения.<br><br>Имате още въпроси? Разгледайте <a href=\"http://habitica.fandom.com/wiki/Equipment#Costumes\">страницата с костюмите</a> в уикито. Направили сте перфектно съчетание? Изфукайте се в <a href=\"/groups/guild/3884eeaa-2d6a-45e8-a279-ada6de9709e1\">гилдията „Карнавал на костюмите“ (Costume Carnival)</a> или се покажете в кръчмата!",
"costumePopoverText": "Изберете „Използване на костюм“, за да екипирате героя си без да променяте показателите на своето бойно снаряжение! Това означава, че облечете каквото пожелаете на героя си без да премахвате бойното си снаряжение.",
"autoEquipPopoverText": "Изберете това, за да екипирате всеки предмет в момента, когато го купите.",
"costumeDisabled": "Вие изключихте костюма си.",
Expand Down Expand Up @@ -104,7 +104,7 @@
"allocatePerPop": "Добавяне на точка към Усет",
"allocateInt": "Разпределени точки към Интелигентност:",
"allocateIntPop": "Добавяне на точка към Интелигентност",
"noMoreAllocate": "След като достигнахте ниво 100, вече няма да получавате повече показателни точки. Може да продължавате да вдигате нива или да започнете ново приключение от ниво 1, използвайки <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Кълбото на прераждането</a>, вече достъпно безплатно на пазара.",
"noMoreAllocate": "След като достигнахте ниво 100, вече няма да получавате повече показателни точки. Може да продължавате да вдигате нива или да започнете ново приключение от ниво 1, използвайки <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Кълбото на прераждането</a>, вече достъпно безплатно на пазара.",
"stats": "Показатели",
"achievs": "Постижения",
"strength": "Сила",
Expand Down Expand Up @@ -156,7 +156,7 @@
"optOutOfClasses": "Отказване",
"optOutOfPMs": "Отказване",
"chooseClass": "Изберете клас",
"chooseClassLearnMarkdown": "[Научете повече относно класовата система на Хабитика](http://habitica.wikia.com/wiki/Class_System)",
"chooseClassLearnMarkdown": "[Научете повече относно класовата система на Хабитика](http://habitica.fandom.com/wiki/Class_System)",
"optOutOfClassesText": "Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете по всяко време от Потребителската иконка -> Настройки.",
"selectClass": "Избиране на <%= heroClass %>",
"select": "Избиране",
Expand Down Expand Up @@ -194,11 +194,11 @@
"unequipPetMountBackground": "Разекипиране на любимец, превоз, фон",
"animalSkins": "Животински кожи",
"chooseClassHeading": "Изберете класа си! Или се откажете и го оставете за по-късно.",
"warriorWiki": "<a href='http://habitica.wikia.com/wiki/Warrior' target='_blank'>Воин</a>",
"mageWiki": "<a href='http://habitica.wikia.com/wiki/Mage' target='_blank'>Магьосник</a>",
"rogueWiki": "<a href='http://habitica.wikia.com/wiki/Rogue' target='_blank'>Мошеник</a>",
"healerWiki": "<a href='http://habitica.wikia.com/wiki/Healer' target='_blank'>Лечител</a>",
"chooseClassLearn": "<a href='http://habitica.wikia.com/wiki/Class_System' target='_blank'>Научете повече за класовете</a>",
"warriorWiki": "<a href='http://habitica.fandom.com/wiki/Warrior' target='_blank'>Воин</a>",
"mageWiki": "<a href='http://habitica.fandom.com/wiki/Mage' target='_blank'>Магьосник</a>",
"rogueWiki": "<a href='http://habitica.fandom.com/wiki/Rogue' target='_blank'>Мошеник</a>",
"healerWiki": "<a href='http://habitica.fandom.com/wiki/Healer' target='_blank'>Лечител</a>",
"chooseClassLearn": "<a href='http://habitica.fandom.com/wiki/Class_System' target='_blank'>Научете повече за класовете</a>",
"str": "СИЛ",
"con": "ЯКО",
"per": "УСЕ",
Expand Down

0 comments on commit 2eab8b2

Please sign in to comment.