Commit Graph

2138 Commits

Author SHA1 Message Date
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
Marcel Klehr e914c972f4 Add german translation for index.html and pad.html 2012-11-10 14:13:51 +01:00
Marcel Klehr e5d1c6b279 Allow translation of pad.html 2012-11-10 14:13:10 +01:00
Marcel Klehr 145e893273 Allow translations for index.html 2012-11-10 14:12:58 +01:00
Marcel Klehr a3504f70c4 Add i18n component 2012-11-10 14:12:17 +01:00
John McLear dc3db7a4a8 Merge pull request #1147 from kingmook/develop
Fix Issue #1122 RE: IE9 and Password Protected Pads using HTTPS
2012-11-08 11:09:43 -08:00
Mike Brousseau 34594eb88b Update src/static/js/pad.js
Check if the browser is IE and if so output the entire path via document.location over document.location.pathname to the cookie creation in createCookie()
2012-11-08 13:47:21 -05:00
John McLear 745a1860ac Merge pull request #1145 from marcelklehr/fix/contributing-md
Try to clean up CONTRIBUTING.md
2012-11-08 08:52:44 -08:00
Marcel Klehr 545026affa Try to clean up CONTRIBUTING.md
and make things clearer
2012-11-08 17:50:17 +01:00
John McLear 8bb8e484ee Merge pull request #1135 from marcelklehr/fix/server-restart-settings-reload
/admin/settings: reload settings on server restart
2012-11-08 08:33:56 -08:00
John McLear 9f76d24646 Merge pull request #1143 from JasonWoof/fix-linux-install-instructions
fix typo in Linux install instructions
2012-11-08 06:15:40 -08:00
Jason Woofenden 01727d1542 fix typo in Linux install instructions 2012-11-07 23:31:24 -05:00
John McLear e1edc8079f Merge pull request #1138 from btherres/develop
fix installDeps.sh for solaris compatibility
2012-11-07 04:13:25 -08:00
Bastian 05f96429ef added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag 2012-11-07 12:51:51 +01:00
John McLear 6148548e00 Fix unclickable / broken links to IRC webchat 2012-11-07 11:10:36 +01:00
Marcel Klehr d26f5d64f7 Fix #1130 Reload settings on /admin/settings server restart 2012-11-06 17:35:52 +01:00
Marcel Klehr e702a86c9f Add ability to reload settings 2012-11-06 17:35:05 +01:00
John McLear 7febd3ff5c Resolve #583
This kinda resolves the issue but not in a very graceful way.  It means any numbered items > 99 will still be cropped.

The problem is due to no padding/margin and then needing to specify margin.

you can replicate this bug with

```
<body style="padding:0; margin:0">
<style type="text/css">
li:nth-child(n+10){
  margin-left:1.6em;
}
</style>
<ol style="list-style-type: decimal;margin-left:1.5em;padding:0;">
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>




</ol>
</body>
```
2012-11-06 12:37:35 +00:00