Commit graph

2671 commits

Author SHA1 Message Date
johnyma22
8b50f194a3 fix README to use ether/ 2012-11-14 19:26:37 +00:00
Marcel Klehr
dff8910966 Fix links in README 2012-11-14 20:05:58 +01:00
John McLear
26ee9c2f16 Update CONTRIBUTING.md 2012-11-14 19:01:05 +00:00
John McLear
97d82fd19f Update README.md 2012-11-14 19:00:40 +00:00
John McLear
68b1d78f32 Merge pull request #1159 from marcelklehr/fix/lang-autodetection
Fix language auto-detection
2012-11-14 10:58:07 -08:00
John McLear
a3ff346547 Merge pull request #1152 from marcelklehr/fix/updatePadClients-error
PadMessageHandler: Make sure sessioninfos[session] still exists before p...
2012-11-14 10:44:30 -08:00
John McLear
3821c1441c Merge pull request #1150 from marcelklehr/fix/script-migrate-dirty-mysql
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
2012-11-14 10:40:11 -08:00
Marcel Klehr
b416402f10 Fix language auto-detection 2012-11-14 19:38:35 +01:00
0ip
dcff0d74ef Fix Timeslider translation not showing up 2012-11-14 19:31:09 +01:00
Peter 'Pita' Martischka
a5c4fb154f Update README.md 2012-11-14 09:29:49 -08:00
Peter 'Pita' Martischka
2aaf80c880 Initial commit 2012-11-14 09:27:21 -08:00
Marcel Klehr
6426b05c67 Merge pull request #1158 from Pita/feature/i18n
Internationalization support!  Yay!
2012-11-14 09:06:56 -08:00
Marcel Klehr
37450340ee Fix typo in timeslider.pageTitle string in french translation 2012-11-14 18:05:51 +01:00
Marcel Klehr
bb33cfb23d Add in docs for L10n 2012-11-14 18:01:01 +01:00
0ip
b69396d5a0 Fix French locale une autre fois 2012-11-14 17:29:06 +01:00
0ip
7ee42edcf1 Document 'lang' Parameter 2012-11-14 17:21:45 +01:00
0ip
d65460a409 Add missing colon in fr-locale 2012-11-14 17:15:28 +01:00
0ip
440804ce0b Update French localization 2012-11-14 17:13:19 +01:00
Marcel Klehr
f5563ab704 Move locale detection to the client
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
2012-11-14 17:01:59 +01:00
Marcel Klehr
ffb7cf47f2 Mate timslider page title translateable 2012-11-14 15:31:43 +01:00
0ip
6b6315ca3c Tidy up settings 2012-11-14 14:26:49 +01:00
John McLear
2d31d3fc46 add colon to language 2012-11-14 12:20:41 +00:00
John McLear
2657f06887 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n 2012-11-14 10:19:52 +00:00
John McLear
838a1e3d69 just export on timeslider, no import.. 2012-11-14 09:31:27 +00:00
John McLear
0e6a701f92 Update src/templates/timeslider.html 2012-11-14 09:20:16 +00:00
John McLear
e0935d9e25 Update src/locales/fr.ini 2012-11-13 20:09:02 +00:00
John McLear
c65a03aaff Update src/locales/fr.ini 2012-11-13 20:08:38 +00:00
johnyma22
a041cea834 French translation thanks to Francis-William Rhaume 2012-11-13 20:06:44 +00:00
John McLear
5b23e99d8c resolve #1044
https://github.com/Pita/etherpad-lite/issues/1044
2012-11-13 19:23:55 +00:00
Peter 'Pita' Martischka
c008d7bbbe Merge branch 'develop' into feature/i18n 2012-11-13 08:47:38 -08:00
Peter 'Pita' Martischka
7d174855c4 Give the browser more time to save the cookie at change_user_name test 2012-11-13 08:39:48 -08:00
Peter 'Pita' Martischka
e13219fec9 deactive test for issue #1125 2012-11-13 08:05:05 -08:00
johnyma22
3830c878d2 change language test -- note i didnt include test for cookie persistance 2012-11-13 07:47:47 -08:00
Peter 'Pita' Martischka
6de7634357 merged develop back in 2012-11-13 07:43:48 -08:00
Peter 'Pita' Martischka
4c095202bd Merged branch feature/frontend-tests 2012-11-13 07:29:57 -08:00
0ip
b28afe4c47 Adjust border-color of #sidediv 2012-11-13 12:42:52 +01:00
0ip
c2253e49b6 Add ability to set language via URL parameter 2012-11-12 18:31:02 +01:00
0ip
b38f5d8f0c Fix German translation 2012-11-12 18:11:06 +01:00
Marcel Klehr
19c12239f6 Simplify lang setting in pad.html template 2012-11-12 18:04:21 +01:00
Marcel Klehr
993d501943 Make L10n.js requireable 2012-11-12 17:42:07 +01:00
Marcel Klehr
ed3020c729 Translate timeslider export links 2012-11-12 17:34:29 +01:00
Marcel Klehr
e81563e18d German translation for timeslider 2012-11-12 17:26:20 +01:00
Marcel Klehr
3bc59f0a7c Add english translation file 2012-11-12 17:25:53 +01:00
Marcel Klehr
378a74fb4e Remove translated strings from template files 2012-11-12 17:24:14 +01:00
Marcel Klehr
4154d464a5 Fix german translation 2012-11-12 16:53:39 +01:00
Marcel Klehr
7021a8b885 Add pad setting for UI lang 2012-11-12 16:49:15 +01:00
Peter 'Pita' Martischka
03d3cd9f24 back to sauce connect download from sauce labs 2012-11-11 19:07:41 -08:00
Peter 'Pita' Martischka
68ed9b219f Fixed another sendkeys bug 2012-11-11 19:04:28 -08:00
Peter 'Pita' Martischka
e385e78310 IE9 doesn't need special IE treatment and works much better with the W3C sendkeys methods 2012-11-11 18:21:43 -08:00
Marcel Klehr
fb340793da Add an empty locales/en.ini - English is default lang in templates 2012-11-11 11:56:59 +01:00