Skip to content
Snippets Groups Projects
Commit a095c763 authored by Olivier Perez's avatar Olivier Perez
Browse files

Merge branch 'feature/Occitan' into 'master'

Feature/occitan

Request in order to integrate the Occitan language, in its lengadocian version, to Framadate. The ISO code is OC.

See merge request !101
parents bde59fe9 2caa5117
No related branches found
No related tags found
No related merge requests found
......@@ -53,6 +53,7 @@ const DEFAULT_LANGUAGE = 'fr';
$ALLOWED_LANGUAGES = [
'fr' => 'Français',
'en' => 'English',
'oc' => 'Occitan',
'es' => 'Español',
'de' => 'Deutsch',
'it' => 'Italiano',
......@@ -85,5 +86,4 @@ $config = [
'default_poll_duration' => 180, // default values for the new poll duration (number of days).
/* create_classic_poll.php */
'user_can_add_img_or_link' => true, // user can add link or URL when creating his poll.
];
];
\ No newline at end of file
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment