Merge branch 'archery' into develop

This commit is contained in:
Blade Barringer 2015-02-17 15:27:19 -06:00
commit 0d395295eb
3 changed files with 3 additions and 10 deletions

View file

@ -22,9 +22,7 @@
"party": "Party",
"createAParty": "Create A Party",
"noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
"startLFG": "To advertise your new party or find one to join, go to ",
"linkLFG": "The Archery",
"endLFG": " on the Wiki.",
"LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
"create": "Create",
"userId": "User ID",
"invite": "Invite",

View file

@ -36,12 +36,7 @@ script(type='text/ng-template', id='partials/options.social.party.html')
=env.t('noPartyText')
pre.prettyprint.
{{user.id}}
p
=env.t('startLFG')
|&nbsp;
a(href="http://habitrpg.wikia.com/wiki/Board:The_Archery_-_LFG")=env.t('linkLFG')
|&nbsp;
=env.t('endLFG')
p!=env.t('LFG', {linkStart: "<a href='https://habitrpg.com/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>", linkEnd: "</a>"})
include ./create-group
script(type='text/ng-template', id='partials/options.social.guilds.public.html')

View file

@ -34,7 +34,7 @@
a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines')
tr
td
a(target='_blank', href='http://habitrpg.wikia.com/wiki/Board:The_Archery_-_LFG')=env.t('lfgPosts')
a(href='https://habitrpg.com/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601')=env.t('lfgPosts')
tr
td
a(target='_blank', href='https://vimeo.com/57654086')=env.t('tutorial')