Commit graph

24 commits

Author SHA1 Message Date
Blade Barringer
7c96d45e86 feat: Add v3 strings to develop for translating (#7354) 2016-05-18 17:25:35 +02:00
Sabe Jones
27e3797307 Merge branch 'develop' into sabrecat/more-modals
Conflicts:
	common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
Blade Barringer
1a6b1f2a1c Update string 2015-10-27 21:36:52 -05:00
Blade Barringer
711413f832 Update string 2015-10-27 21:28:33 -05:00
Blade Barringer
c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon
47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Sabe Jones
22ec450521 feat(modals): Won Challenge
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
2015-10-16 23:36:57 -04:00
lacrimae
b8bd87eeb8 Wording: Proper English it was not 2015-08-20 16:55:05 +02:00
Alys
71a9f7caf4 make challenge permission error messages translatable 2015-08-16 17:30:51 +10:00
Garrison Taylor
a261840fb3 Rewrite the maximum gems sentence
It is not in plainer English
2015-08-09 09:40:38 -04:00
Blade Barringer
e28bd5bc57 Update English strings 2015-07-30 21:36:09 -05:00
Blade Barringer
bcb128f4b6 Adjust wording for tavern challenge popover 2015-07-24 17:30:38 -05:00
TheHollidayInn
fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
TheHollidayInn
838c912906 Moved clone tasks function to task service 2015-06-17 22:22:55 -05:00
TheHollidayInn
7890abe31a Added clone ability to challenges. 2015-06-17 21:08:03 -05:00
GihHubSphinx
071f2796db Adjusting challenges view translation
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
Blade Barringer
ddb28c0305 Merge branch 'develop' into TheHollidayInn-challenges-owner-filter 2015-06-13 18:23:51 -05:00
agentx999
d172d1548c challenge task text 2015-05-27 16:14:24 -07:00
Blade Barringer
abbfdaeda5 Adjust NotGonnaGitUs's PR
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
TheHollidayInn
74ef8cd443 Added filter by owner for challenges 2015-04-22 11:54:01 -05:00
Sphinx
7efb594838 Pulling in commits from shared repo
Additional changes to other languages are required before merging!

https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
Conflicts:
	locales/en/challenge.json
2015-04-09 08:01:34 -05:00
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
kholliday
8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Blade Barringer
c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00
Renamed from locales/en/challenge.json (Browse further)