20 Commits

Author SHA1 Message Date
Samuel Georges
a548d6ee56 Merge remote-tracking branch 'remotes/origin/stable' into develop
Conflicts:
	modules/backend/lang/en/lang.php
	modules/backend/lang/fr/lang.php
2016-04-01 13:00:32 +11:00
Samuel Georges
2ac23cc3c7 More peer review of #1856
Separation of concerns, the language file shouldn't really be treated as a data source for the supported encoding options.
2016-03-26 14:28:34 +11:00
Jérémy Gaulin
2a60e34558 Import options to configure the CSV reader + patch to prevent unfriendly error to be thrown due to bad import source file encoding (on AJAX request) 2016-03-26 12:54:13 +11:00
Jérémy Gaulin
8debdf023a Externalized import/export errors strings + french translation 2016-03-20 22:22:36 +01:00
Jérémy Gaulin
e24e467b60 Externalized keys + French translation 2016-02-13 15:51:28 +11:00
Samuel Georges
5c12d99cc9 Minor revision to #1469 2015-10-17 08:41:10 +11:00
Karl Thibault
d9e85380af Add localization for the backend Switch widget 2015-09-26 22:03:05 -04:00
Jérémy GAULIN
29a8ec1143 Ensure the client side language file is properly loaded
Switch widget needs short text. There is not really a 3 letters word or abreviation in french that is as understable as raw "On/Off".

Tidy up patch

Fix quote

https://github.com/octobercms/october/pull/1363/files#r36929168
2015-08-15 09:46:26 +10:00
Raphaël M
1c5ba4438b Update of FRENCH translation for OctoberCMS
Update of FRENCH translation for OctoberCMS

Update of FRENCH translation for OctoberCMS

Update of FRENCH translation for OctoberCMS
2015-08-15 09:41:11 +10:00
Samuel Georges
961509839e Manually merge Pull Requests that are prepared incorrectly
Fixes #1229
Fixes #1259
Fixes #1260
Fixes #1261
Fixes #1262
Fixes #1263
Fixes #1264
Fixes #1277
Thanks @felixinx @awaysoft @tsioukas @Freakspot
2015-07-11 14:36:38 +10:00
Samuel Georges
4f0fa37d6f Update of FRENCH Translation for OctoberCMS - thanks @Galixte
Fixes #1248 without 11 commits
2015-07-04 10:36:32 +10:00
Samuel Georges
c813318729 Added preview mode support to File upload widget
Widget also passes CSRF token
Switched to using a header instead of POST flag
2015-06-25 10:55:46 +10:00
Samuel Georges
e6f70eafdd Translate prompt for FileUpload + MediaFinder
Remove redundant language key
Recompile assets
2015-06-20 22:21:18 +10:00
Samuel Georges
29ae622803 Fixes #1154 without 4 commits 2015-05-30 12:46:30 +10:00
Tanguy Bodin-Hullin
0d31308e17 Update lang.fr
Small correction to adapt the message of the object gender when creating/updating/deleting
2015-04-26 01:07:18 +02:00
fschildknecht
ea722314ae Update editor french translation 2015-03-20 15:33:56 +01:00
fschildknecht
561254dcd2 Update french back-end translation file 2015-03-20 15:20:40 +01:00
Samuel Georges
a8389fb1aa Tooltip now auto initializes
initForm can now pass context
Various improvements and bug fixes
2015-03-12 20:50:16 +11:00
sl1nk3
5768ebaabb Fixed some issues with the French translation,
Added it to the settings menu.
2014-08-07 00:31:09 -04:00
Fabien
5b7161cdd5 Add french translation 2014-08-03 15:20:59 +02:00