sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 03:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'LuneFox-develop' into develop

Browse source
This commit is contained in:
Blade Barringer 2015-09-19 10:41:47 -05:00
commit 87197bea8a
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/locales/en/groups.json
View file

@ -12,6 +12,7 @@
"community": "Community Forum",
"dataTool": "Data Display Tool",
"resources": "Resources",
"askQuestionNewbiesGuild": "Ask a Question (Newbies Guild)",
"tavernTalk": "Tavern Talk",
"tavernAlert1": "Note: if you're reporting a bug, the developers won't see it here. Please",
"tavernAlert2": "use GitHub instead",

2
test/spec/translations.js
View file

File diff suppressed because one or more lines are too long

3
website/views/options/social/tavern.jade
View file

@ -56,6 +56,9 @@
tr
td
a(target='_blank', href='http://habitica.wikia.com/wiki/Special:Forum')=env.t('community')
tr
td
a(target='_blank', href='https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestionNewbiesGuild')
// Player Tiers
.panel.panel-default(popover=env.t('tierPop'), popover-trigger="mouseenter", popover-placement="right")