Commit graph

3439 commits

Author SHA1 Message Date
Filippos
fafa17c80d Removed clientSideStrings 2013-11-14 17:25:15 +02:00
Filippos
412c9efd60 Added Greek Language 2013-11-14 17:01:13 +02:00
Tyler Renelle
ddb73f806a translations: prep old app.json files for new setup 2013-11-14 01:27:11 -08:00
Nicole Foster
d44d6168bf JP: translated head, skin, and profile heading and half translated show helm 2013-11-14 00:51:05 -08:00
Tyler Renelle
8b33019b75 [#1813] add bg.original.json, since old bg file not compatible with new
json. will need to revisit
2013-11-14 00:35:00 -08:00
Tyler Renelle
5914848308 [#1813] restore lost PT translations (@DanielTheBard can you double check
this?)
2013-11-14 00:25:36 -08:00
Tyler Renelle
10e9c205e6 Merge branch 'translations' into develop
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
2013-11-13 23:37:29 -08:00
Tyler Renelle
6512e17454 translations: temporarily using locales_new so we can work with existing
PRs (@paglias). I want to merge to develop sooner-than-later to avoid near-future
conflicts. Pushing to beta
2013-11-13 23:36:18 -08:00
Tyler Renelle
95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link
replace github contributing links → wikia link
2013-11-13 23:26:19 -08:00
Tyler Renelle
5038885baf [#923] also migrate group.websites => group.description (@Fandekasp the
user stuff is solid, thanks!)
2013-11-13 23:24:59 -08:00
Tyler Renelle
aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website
remove broken website field from profile
2013-11-13 23:09:27 -08:00
Adrien Lemaire
9083645dc3 migration script: websites → blurb 2013-11-14 17:57:07 +11:00
Adrien Lemaire
153d1957a8 clean code from websites
Need review !
2013-11-14 15:20:35 +11:00
Adrien Lemaire
340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Tyler Renelle
1150de9d9d Merge pull request #1780 from Fandekasp/fix_armour
Issue #1149: armour → armor
2013-11-13 16:19:04 -08:00
Adrien Lemaire
c90248f817 update new armour → armor after rebase 2013-11-14 11:13:09 +11:00
Adrien Lemaire
1fab48f1db Issue #1149: armour → armor 2013-11-14 11:10:54 +11:00
Tyler Renelle
6a6ca49351 Merge pull request #1782 from Fandekasp/fix_fr
review and fix fr typos
2013-11-13 16:02:35 -08:00
Adrien Lemaire
9a8b0f91f2 review and fix fr typos 2013-11-14 10:54:41 +11:00
Tyler Renelle
ef9d423a49 Merge pull request #1799 from nafoster/ja_trans
JP: Translated avatar heading, website heading, and changed medium to above average
2013-11-13 15:47:17 -08:00
Daniel the Bard
7291e3c97c Update app.json
Skipped over lines 28-46 for now. Will come back to look over them.

- Line 56 - História makes more sense than Histórica I believe. Unless it's the history of a masculine object, such as histórico de crédito, história should be the go-to I believe.
- Line 4 - Originally put enquanto, switched to quando. Returned HP to pontos de vida. HP should make sense but might not to a Portuguese non-gamer.
- Line 60 - Changed from Logar-se / Inscrever-se to Iniciar sessão / Regista-se.
- Line 68 - Grupo to Partido
- Line 86 - Deletar to Eliminar
- Line 112 - Limpar (clean) to Eliminar
- A few other minor changes
2013-11-13 15:36:51 -08:00
Daniel the Bard
0a0a8bc1a0 Portuguese Translation Fixes
Checked through lines 1-24:

- Fixed general verb and noun mistakes
- Fixed a few words that were still in English
- Kept role-playing game in English. RPG's should be understood by Portuguese-speakers. 
- Pretty sure como makes more sense than conforme.
- Believe I fixed some improper use of the imperative form. Correct me if I'm wrong.
- Pluralized recompensas
- Changed Bem vindo to boas-vindas. Bem-vindo may be accurate though?
- Other general fixes that escape me.

Plan to do more.
2013-11-13 15:36:51 -08:00
Daniel the Bard
2aa9c0ed56 Update app.json
Did some edits to lines 1-16. Will continue.
2013-11-13 15:36:51 -08:00
Tyler Renelle
af20b91473 Merge pull request #1784 from Fandekasp/ja_trans
start japanese translations
2013-11-13 15:30:28 -08:00
Guillaume Piolle
b0a8e75893 Rephrasing proposals 2013-11-13 15:27:27 -08:00
Guillaume Piolle
07433b707a Correcting typos 2013-11-13 15:27:27 -08:00
Tyler Renelle
2506e7b86c Merge pull request #1595 from Arcklo/translations
Added Portuguese Translation
2013-11-13 15:24:06 -08:00
Tyler Renelle
0131b8dc93 Merge remote-tracking branch 'lolole13/translations' into translations
Conflicts:
	locales/fr/app.json
2013-11-13 15:21:41 -08:00
Tyler Renelle
78c01d226c Merge remote-tracking branch 'bennyp123/master' into translations
Conflicts:
	locales/he/app.json
2013-11-13 15:18:27 -08:00
Tyler Renelle
1706c29df7 Merge remote-tracking branch 'blixhavn/master' into translations
Conflicts:
	locales/no/app.json
2013-11-13 15:10:03 -08:00
Tyler Renelle
7eb7669cce Merge pull request #1111 from Noeska/translations
Dutch Translations
2013-11-13 15:00:04 -08:00
Tyler Renelle
20bb49253d translations: temporarily swap locales_old/locales so we can merge all
the PRs (will put back to normal after)
2013-11-13 14:54:17 -08:00
Matteo Pagliazzi
d85084c165 translations: add italian sample for testings & fix 2013-11-13 23:21:09 +01:00
Matteo Pagliazzi
47a1605460 merge missing strings from english at server start up 2013-11-13 23:13:00 +01:00
Tyler Renelle
827be92fa1 Merge pull request #1802 from snicker/develop
case-insensitive highlighting for usernames in chat
2013-11-13 13:35:37 -08:00
Matteo Pagliazzi
1b0bed0428 translations: add check 2013-11-13 22:04:31 +01:00
Matteo Pagliazzi
83d9368c2e translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set 2013-11-13 22:01:02 +01:00
Nick Gordon
528fd5f067 case-insensitive highlighting for usernames in chat 2013-11-13 06:57:48 -08:00
Tyler Renelle
1db0ae9f76 Merge pull request #1801 from snicker/develop
support for npc styling in autocomplete list to match messages
2013-11-12 22:03:54 -08:00
Nick Gordon
0ac1f4e397 support for npc styling in autocomplete list to match messages 2013-11-12 21:45:31 -08:00
Tyler Renelle
56b1684a45 Merge pull request #1798 from snicker/develop
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
Nick Gordon
66c0840e76 a few fixes and performance increases:
* username autocompletes on click now instead of showing undefined
* an adjustable 'update interval' stops the huge performance hit by delaying events from firing until the user has stopped typing for a while
* nested controllers can cause issues because of prototypal inheritance if the models are not defined correctly... with ChatCtrl._chatMessage, this was the case. Modified it to fit in better with "best practices". See blog post here: http://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html
2013-11-12 20:04:37 -08:00
Nick Gordon
f2aaf88b1c forked the angular-at-directive code and made changes to support minification
perhaps this is something that should be absorbed into habitrpg-shared
2013-11-12 16:47:36 -08:00
Matteo Pagliazzi
72207ac1e2 readme updated with all the info, @lefnire translations are ready! everything that you need to know is in the readme 2013-11-12 22:24:45 +01:00
Matteo Pagliazzi
22267805ee add support for getting strings under clientSideStrings and update sample 2013-11-12 22:23:47 +01:00
Matteo Pagliazzi
be2010b0a2 add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code 2013-11-12 22:01:27 +01:00
Matteo Pagliazzi
7351697cbb moves locales to locales_old 2013-11-12 21:18:40 +01:00
Nicole Foster
2318243ebd Translated medium to above average, avatar heading, and website heading 2013-11-12 10:56:06 -05:00
Nick Gordon
edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00
Matteo Pagliazzi
8a2059ee2f typo 2013-11-12 16:24:22 +01:00