Commit Graph

1535 Commits

Author SHA1 Message Date
Nicolas Bouilleaud
b6723120ab Fix po files following #387
The msgid actually used in yyyy-mm-dd-for-humans, not year-month-day.
2019-04-19 15:56:53 +02:00
Nicolas Bouilleaud
bc78721381 Fix i18n.php review comments
* Use the actually found locale for $locale in the rest of the app
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
955faa108c Fix i18n.php review comments
* Use the DEFAULT_LANGUAGE as the default in locale_lookup.
* Initialise the translators explicitly.
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
94739ba971 Fix i18n.php review comments
Use the DEFAULT_LANGUAGE as the default in locale_lookup.
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
20240fee15 Fix i18n.php review comments
* remove useless is_string check
* use the DEFAULT_LANGUAGE when Accept-Language is invalid.
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
780392bb37 Remove i18n related stuff from gitlab-ci 2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
aca1b57dfc Enable Hungarian (Magyar) 2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
0353e6f0d7 Add all po files 2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
98c43f4685 Remove i18n json files 2019-04-19 14:47:15 +02:00
Nicolas Bouilleaud
e7947354ac Fix smarty_function_markdown_to_text() to use $locale 2019-04-19 14:46:26 +02:00
Nicolas Bouilleaud
1f05d88c42 Remove old buildland / compare 2019-04-19 14:46:26 +02:00
Nicolas Bouilleaud
31f0a26baa Remove o80/i18n 2019-04-19 14:46:26 +02:00
Nicolas Bouilleaud
ecac9ccc94 Remove all scripts for json-based i18n 2019-04-19 14:46:26 +02:00
Nicolas Bouilleaud
3a6317c25a Rework i18n using Symfony/translation
Reimplement the __() and __f() functions using Symfony.
2019-04-19 14:46:26 +02:00
Thomas Citharel
705abe6cd6 Merge branch 'ci-migration-testing' into 'develop'
ci: some cleanup of the gitlab-ci file and testing migrations on MySQL

See merge request framasoft/framadate/framadate!388
2019-04-19 14:32:56 +02:00
PaulR
c26fef6b39 CI: cleanup the gitlab-ci yml file and test MySQL and PostgreSQL migrations
This commit splits the `test` job into three separate jobs:
- test
- lint
- db:migrate

It also factorise some code, and remove useless use of git checkout
2019-04-19 14:32:56 +02:00
Thomas Citharel
d87ca39693 Merge branch 'locales/pot-change-after-387' into 'develop'
Update pot after !387

See merge request framasoft/framadate/framadate!392
2019-04-19 13:51:48 +02:00
Thomas Citharel
2c056068de
Update pot after !387
(also make sure it's pushed to Zanata)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-19 13:50:50 +02:00
Thomas Citharel
36bff4d5cc Merge branch 'localize-date-placeholders' into 'develop'
i18n: localize the date format placeholders

See merge request framasoft/framadate/framadate!387
2019-04-19 13:38:41 +02:00
Thomas Citharel
b63e90e53f Merge branch 'docker/smtp' into 'develop'
Add development SMTP server in docker-compose

See merge request framasoft/framadate/framadate!391
2019-04-19 13:35:21 +02:00
Liquidsoul
e03ad97382
Add development SMTP server 2019-04-19 12:59:13 +02:00
Pierre de La Morinerie
fe5d28e394 i18n: use full nouns in date placeholders 2019-04-18 15:44:06 +02:00
Pierre de La Morinerie
78714069f0 i18n: localize the date format placeholders
For instance, when using French, display the date input placeholder
as "jj/mm/aaaa" (instead of "dd/mm/yyyy").

This doesn't change the way dates are actually parsed – only what is
displayed to the user changes.
2019-04-18 12:18:02 +02:00
Thomas Citharel
c9382973ca Merge branch 'locales/add-locales-for-385' into 'develop'
Add locales for !385

See merge request framasoft/framadate/framadate!386
2019-04-18 12:07:56 +02:00
Thomas Citharel
a0d29ea0d5
Add locales for !385
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-18 12:06:55 +02:00
Thomas Citharel
4bd8e248e0 Merge branch 'fix-expiry-date' into 'develop'
locales: fix missing "Expiry date" key

See merge request framasoft/framadate/framadate!385
2019-04-18 12:00:34 +02:00
Pierre de La Morinerie
ee4053c524 locales: fix missing "Expiry date" key 2019-04-18 11:56:48 +02:00
Thomas Citharel
93d9f44bb1 Merge branch 'mail/templates' into 'develop'
Extract mail content creation and sending into the NotificationService

See merge request framasoft/framadate/framadate!382
2019-04-18 11:24:07 +02:00
Liquidsoul
c72dfa17b8
Extract mail creation for FindPollsByMail into NotificationService 2019-04-17 17:41:21 +02:00
Liquidsoul
26d3552276
Move edit link mail notification to NotificationService 2019-04-17 17:41:21 +02:00
Liquidsoul
fb05b82e66
Use NotificationService to send poll creation mails 2019-04-17 17:41:20 +02:00
Liquidsoul
8dcea674e8
Add notificationservice->sendPollCreationMails 2019-04-17 17:41:20 +02:00
Liquidsoul
ad8f8ab22c
Extract creation mails content into smarty templates 2019-04-17 17:41:20 +02:00
Liquidsoul
29e599983e
Add smarty dependency on NotificationService 2019-04-17 17:41:20 +02:00
Thomas Citharel
4f7e858ed3 Merge branch 'locales/fix-date-format' into 'develop'
Fix date format

See merge request framasoft/framadate/framadate!381
2019-04-17 17:32:01 +02:00
Thomas Citharel
3cebdfa1ea
Fix date format
Parsing and displaying

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-17 17:30:12 +02:00
Thomas Citharel
89d94fb16b Merge branch 'mm/framadate-bug/datepicker-disable-selected-dates' into 'develop'
Fix already selected days not being highlighted

Closes #361

See merge request framasoft/framadate/framadate!380
2019-04-17 16:22:09 +02:00
m
f2b57fec9b
correct #361 2019-04-17 16:15:14 +02:00
Thomas Citharel
d50305afb3 Merge branch 'workaround-datepicker-below-modal-safari' into 'develop'
Workaround the datepicker appearing below the add_days modal on Safari

See merge request framasoft/framadate/framadate!379
2019-04-17 16:12:30 +02:00
Thomas Citharel
1062f72d56 Merge branch 'fix-trads' into 'develop'
scripts: fix translations

See merge request framasoft/framadate/framadate!377
2019-04-17 16:01:03 +02:00
Nicolas Bouilleaud
61c449205c Workaround the datepicker appearing below the add_days modal on Safari
The correct solution would probably be to upgrade the version of bootstrap and bootstrap-datepicker that we use

My understandng of the bug is:
* bootstrap-datepicker finds the first ancestor whose z-index isn’t auto, and sets its own z-index to the found elemenents z-index + 10.
* On Firefox and Chrome, the modal element is returned (its z-index is 1050)
* On Safari, the modal-dialog element is found. Its z-index is auto, but Safari reports this as '0', which makes the z-index of the datepicker 10.
2019-04-17 15:51:00 +02:00
Pierre de La Morinerie
20c324a018 templates: fix localisation of a string 2019-04-17 15:09:08 +02:00
Pierre de La Morinerie
d110ee558f scripts: fix translations
Translations with a comma in the key are rewritten to be on a single
line.

But this failed when the comma was just preceded by a dot (like in
`etc.,`).

Fix the script so that it works even in those cases.
2019-04-17 12:51:37 +02:00
Thomas Citharel
723cf83484 Merge branch 'locale/update' into 'develop'
Update locales

See merge request framasoft/framadate/framadate!376
2019-04-17 10:18:23 +02:00
Thomas Citharel
b73ce470b8
Update locales
Following !373

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-17 10:16:53 +02:00
Thomas Citharel
fd2d00b2f6 Merge branch 'feature/prevent-leaving' into 'develop'
Prevent leaving in case of vote started or comment written but not submitted

See merge request framasoft/framadate/framadate!373
2019-04-17 10:11:11 +02:00
Thomas Citharel
ec939a8a30 Merge branch 'framadate-bug/limit_end_date_when_updating_poll' into 'develop'
Limit end date when updating poll (#336)

See merge request framasoft/framadate/framadate!372
2019-04-16 16:14:15 +02:00
Thomas Citharel
0fb673457b Merge branch 'improvement/better-default-domain-with-docker' into 'develop'
Improvement/better default domain with docker

See merge request framasoft/framadate/framadate!371
2019-04-16 16:13:23 +02:00
2e87e1f761
Fixed the previous fix about end_date bug in case of too far date. 2019-04-16 16:06:00 +02:00
38552da738
Updated AdminPollService to limit end_date (#336). 2019-04-16 16:06:00 +02:00