Commit Graph

293 Commits

Author SHA1 Message Date
Pierre Rudloff f344169157 Missing string in French and English locales 2018-03-19 13:46:46 +01:00
Luc Didry f340fbe046 Update json locale files (fetched from Zanata) 2018-02-27 17:12:25 +01:00
Luc Didry 1c8e0061b5 [Zanata] Prettyfying locales json files
In order to compare actual json files to zanata-backed files, we need to
sort the keys and have a 3-spaces indent.

This is done with jq:

cd locale/
mkdir tmp/
for i in *.json; do jq --indent 3 -S -M '.' < $i > tmp/$i ; done
mv tmp/* .
rmdir tmp
2018-02-27 17:12:15 +01:00
Tubia 1d89074965 Translate missing italian strings
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 12:08:57 +01:00
Lukas Müller 710304c183 German translation
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:44:44 +01:00
Thomas Citharel 7e12443bc2 Merge branch 'develop' into funky 2018-02-20 19:40:51 +01:00
Thomas Citharel 801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel 1de98223db Add a check at install to suggest setting session.cookie_httponly inside php.ini
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 17:44:08 +01:00
Marjolaine Vé c350a7a012 Changement de le·a en le ou la 2018-02-20 17:04:11 +01:00
Marjolaine Vé f11fd8c541 [FR] Ecriture inclusive 2018-02-20 17:04:11 +01:00
Thomas Citharel ff47a21ac2 Check that conditions on valueMax are acceptable before adding the vote
Handles people voting when the answers valueMax has been reached by someone else in the background

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 16:47:10 +01:00
Erwan TERTRAIS 64ff414900 ValueMax : limit the number of voters per option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 14:15:18 +01:00
DAVID Titouan 1740a1d949 issue 240 desactivation checkbox resultat public
changement du nom de l'option "resultat visible" dans password en "seul les votes sont proteges"

correction de l'ajout du js pour issue240

correction test pour desactivation dynamique du champ
2018-02-20 10:58:30 +01:00
Thomas Citharel af8c00f2b5 Merge branch 'feature/description' into 'develop'
Add description meta tag

See merge request framasoft/framadate!205
2018-02-19 10:54:20 +01:00
Thomas Citharel 68a47dba73 Merge branch 'master' into 'master'
Ajout de traductions Allemandes

See merge request framasoft/framadate!207
2018-02-18 23:40:18 +01:00
Thomas Citharel 1b105ba1d8 Merge branch 'dutch-locales' into 'master'
nl translations

See merge request framasoft/framadate!197
2018-02-18 23:40:00 +01:00
Thomas Citharel 3183b54dbf Merge branch 'master' into 'master'
Update it.json - some italian translation

See merge request framasoft/framadate!190
2018-02-18 23:39:24 +01:00
root 10dca1c2c5 update German translations 2018-02-05 13:02:43 +01:00
goofy-bz f18ce7845d Update fr.json 2018-01-21 11:03:52 +01:00
goofy-bz 4e8d77f9af Update fr.json 2018-01-21 11:01:42 +01:00
Pierre Rudloff 2f2378a80f Add description meta tag 2018-01-16 14:04:02 +01:00
Yannick Francois b93ff95a54 Corrige une faute d'anglais dans la clé d'un message 2018-01-04 22:53:18 +01:00
SpF 2bc9eb62d0 nl translations 2017-12-20 11:35:50 +01:00
Nikos 6a2ee5604e Update it.json - some italian translation 2017-09-13 13:31:15 +02:00
Quentin d33cc58cf7 Update oc.json 2017-09-02 11:06:26 +02:00
Quentin c03bd0216f Update oc.json with thin non-breakable spaces and + apostrophes + translations 2017-09-02 09:22:28 +02:00
Gwenn Meynier 71d8ef5134 [l10n] another breton fix 2017-06-21 23:29:55 +02:00
Gwenn Meynier f8e00084be [l10n] corrections for breton translation 2017-06-14 13:24:02 +02:00
Antonin e9199d8396 Merge branch 'master' into 'master'
More NL translations

See merge request !172
2017-03-19 18:26:53 +01:00
Antonin 53cf6498ed Merge branch 'bugfix/install' into 'master'
Bugfix/install

See merge request !168
2017-03-19 18:25:04 +01:00
Jeroen Demeyer be44e53eda More NL translations 2017-01-06 14:19:49 +01:00
Damien Finck 7e05d8aef8 Improve a warning message 2016-12-27 18:11:52 +01:00
Damien Finck 5bb3d394a1 Add new key in all locales 2016-12-27 16:07:09 +01:00
Damien Finck 5012ed32db Fix typo + add key in all locales 2016-12-27 16:03:06 +01:00
Damien Finck 03727577e8 Add missing key 2016-12-27 15:29:46 +01:00
Damien Finck 57d6e1c0a4 Resources standardization 2016-12-27 15:29:25 +01:00
Damien Finck 545f167a7b Fix the check of template dir 2016-12-27 15:15:26 +01:00
Antonin 0a0b3b233b Correcting the NL date locale 2016-12-26 16:41:33 +01:00
Antonin 44aca0a7e7 Correcting the NL date locale 2016-12-26 16:38:26 +01:00
Antonin e17abed619 Get back the NL locale from master. 2016-12-26 16:32:07 +01:00
Olivier Perez c6a98e16e8 Translate missing wordings 2016-10-24 19:31:51 +02:00
goofy-bz 250a6bba65 Update fr.json - my bad 2016-10-14 19:32:13 +02:00
goofy-bz c7992be6bb Update fr.json - minor fix s/optionnel/facultatif 2016-10-14 19:29:30 +02:00
Antonin b2d8723043 Unification of locale indentation. 2016-10-13 17:40:48 +02:00
Antonin ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +02:00
Quentin 4eb2d8b381 Update oc.json 2016-10-12 20:01:23 +02:00
Gwenn 72221fd0a3 Update br.json 2016-10-12 17:19:48 +02:00
Olivier PEREZ 2377013a6f Fix Breton dates management 2016-10-06 23:36:07 +02:00
Antonin 671f37c05c Merge branch 'feature/Disable_when_results_are_hidden' into 'release'
Disable when results are hidden

Fix #196

See merge request !154
2016-10-06 22:46:24 +02:00
Antonin 8bc9b05329 Added missing translation for "Optional parameters" 2016-10-06 22:39:13 +02:00
Olivier PEREZ d980571a74 Disable export when results are invisibles 2016-10-06 21:13:01 +02:00
Antonin 785d1fe55f Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:55:27 +02:00
Antonin 0fd5348ff5 Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:53:00 +02:00
Gwenn Meynier 205dd08013 restore and update br translation file 2016-09-21 00:50:54 +02:00
Gautier Pelloux-Prayer 65872d1c7b i18n: update french translation 2016-09-05 22:03:39 +02:00
Olivier Perez f3ce74d997 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:45 +02:00
Olivier Perez 469d288136 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:18 +02:00
Antonin e79a0bf683 Merge branch 'release' into develop 2016-08-08 15:23:42 +02:00
Antonin d762c38e81 Add a 'remove this day' button 2016-08-07 12:22:58 +02:00
Olivier Perez 1d5af5de3b
Add missing translations 2016-08-05 12:02:41 +02:00
Antonin c50ca48efd Merge branch 'feature/rework_poll_creation_1st_page' into 'release'
Rework on 1st page of poll creation



See merge request !142
2016-08-04 22:07:52 +02:00
Olivier Perez 9b39dd2fa1
New style of URL customization 2016-08-04 21:44:31 +02:00
Olivier Perez 64fe5e0589
Add 'Permissions' section 2016-08-04 20:19:17 +02:00
Antonin dc9babd2ed Merge branch 'develop' into feature/better-markdown 2016-08-04 17:49:40 +02:00
Antonin fe3e1bc8b7 Merge branch 'feature/update-breton-translation' into 'develop'
Update, fix and add breton translation to correct branch



See merge request !143
2016-08-04 17:29:29 +02:00
gwenn f99c402e6d Update, fix and add breton translation to correct branch 2016-07-31 00:31:43 +02:00
Olivier Perez 7b5f42b174 New style for password fields 2016-07-29 17:50:37 +02:00
Olivier Perez d7675831e1
New style of poll id 2016-07-29 14:47:56 +02:00
Erik Martin-Dorel b69c171d79 Fix typo in locale/en.json 2016-06-21 22:31:23 +02:00
Markus Jung a1ca38e269 Update german translation 2016-06-18 22:46:02 +02:00
Erik Martin-Dorel ecb79e3dc1 Fix typo in locale/en.json 2016-06-13 18:48:05 +02:00
Antonin bcb289406e Missing translation ; prompt URL option enabled 2016-05-12 17:57:53 +02:00
Antonin a37d621fab Factorized description button and added modal hint. 2016-05-12 17:41:27 +02:00
Antonin f92d0009bb Confirmation on column removal 2016-05-10 16:11:47 +02:00
Antonin 905208c211 Deny the possibility to add an empty slot. 2016-05-09 15:07:23 +02:00
Olivier Perez feba9ebc96 Merge branch 'develop' into FixDatePicker 2016-05-04 19:41:34 +02:00
Olivier Perez de9ca55feb Merge branch 'improvement/install' into 'develop'
Improvement - install

A check.php page before install
Updating config.tpl
Verification of config.php creation at install

See merge request !116
2016-05-04 19:28:33 +02:00
Olivier Perez 0f75055517 Fix langs + date formats 2016-05-04 19:21:40 +02:00
Antonin b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Olivier Perez 5ae9d8fc1b Reword FR "Export en CSV" to "Export Tableur (CSV)" 2016-05-04 01:07:24 +02:00
Antonin f046cbdf95 Check.php 2016-05-04 00:57:45 +02:00
Olivier Perez ab0748597a Merge branch 'feature/improve-self-editing-vote' into 'develop'
Feature : improve self editing vote

Adding a possibility to the user to enter his email address and to receive the personalized url by email.

See merge request !110
2016-05-03 21:16:05 +02:00
Antonin 00dcd4a006 Better use of the translation system 2016-05-03 21:12:51 +02:00
Antonin 73eb1d07da Removing unused translations. 2016-05-02 15:16:05 +02:00
Antonin 2f7b48d142 Improved the email template for finding polls 2016-05-02 15:13:38 +02:00
Antonin fc235cefeb Using o80::i18n shortcut and cleaning 2016-05-02 14:10:14 +02:00
Antonin 97a9d49c20 Added personalized link translations 2016-05-01 14:21:31 +02:00
Olivier PEREZ 96c28738c4 PHP: Check if there are at most MAX_SLOTS_PER_POLL dates before create a poll 2016-04-26 23:16:08 +02:00
Olivier PEREZ 51fbee139d Javascript : Don't let user insert more than 123 dates in a row 2016-04-26 22:45:59 +02:00
Olivier PEREZ c493de7cbe Merge branch 'develop' into feature/create_interval_date 2016-04-26 21:53:47 +02:00
Olivier PEREZ a055c6d739 Merge branch 'master' into develop 2016-03-23 22:57:04 +01:00
Olivier Perez 448b5e05b5 Merge branch 'feature/ES_translate' into 'master'
Translation to spanish

Merci pour le service framadate !

See merge request !103
2016-03-23 22:43:39 +01:00
Olivier Perez 28381f18a6 Merge branch 'Fix/119-Translations-change' into 'develop'
119 - Amélioration des traductions pour les permissions d'édition d'un sondage.

Changement des libellés visibles par le créateur d'un sondage concernant les permissions d'édition d'un vote.

Fix #119 

See merge request !107
2016-03-23 22:40:14 +01:00
Olivier PEREZ c141644c21 Merge branch 'Quent--y/framadate-feature/Occitan' 2016-03-23 20:59:23 +01:00
Olivier PEREZ 783affb73a Remove trailling dots 2016-03-14 23:55:12 +01:00
Quentin 39b4673bab Update, best coherence in vocabulary 2016-03-11 15:22:07 +01:00
Antonin 8909333f09 Encore un point en trop... Yurk.~ 2016-03-05 18:35:46 +01:00
Antonin 7da17c4f28 Suppression d'un point inutile dans une traduction. 2016-03-05 18:24:07 +01:00
Antonin ebfdf68d15 Libellés changés pour la modification des votes du sondage.
Fixes #119
2016-03-05 18:02:22 +01:00
Olivier PEREZ 0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00