diff --git a/conf/variables.php.template b/conf/variables.php.template index a56ccf8..4c091f8 100644 --- a/conf/variables.php.template +++ b/conf/variables.php.template @@ -79,7 +79,7 @@ const LOGOLETTRE = ''; -const IMAGE_TITRE = 'images/logo.png'; +const IMAGE_TITRE = './images/logo.png'; // Activation des URL propre (true pour activer, false sinon) const URL_PROPRE = false; diff --git a/scripts/install b/scripts/install index f2c2f77..3d75b82 100755 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,7 @@ sudo sed -i "s/yunoadmin/$admin/g" $final_path/variables.php sudo sed -i "s/I18NTOCHANGE/$language/g" $final_path/variables.php sudo sed -i "s@yunourl@$domain$path@g" $final_path/variables.php sudo sed -i "s@yunodomain@$domain@g" $final_path/variables.php -sudo sed -i "s/yunoinfolegal/$legal/g" $final_path/variables.php +sudo sed -i "s°yunoinfolegal°$legal°g" $final_path/variables.php # Create log file touch $final_path/admin/logs_studs.txt @@ -84,7 +84,7 @@ sudo chmod 644 $finalphpini # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart - +sudo apt-get install php-fpdf sudo yunohost app addaccess opensondage -u $admin sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/opensondage.conf sudo service nginx reload diff --git a/scripts/upgrade b/scripts/upgrade index 00a8104..312cd32 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ sudo sed -i "s/yunoadmin/$admin/g" $final_path/variables.php sudo sed -i "s/I18NTOCHANGE/$language/g" $final_path/variables.php sudo sed -i "s@yunourl@$domain$path@g" $final_path/variables.php sudo sed -i "s@yunodomain@$domain@g" $final_path/variables.php -sudo sed -i "s/yunoinfolegal/$legal/g" $final_path/variables.php +sudo sed -i "s°yunoinfolegal°$legal°g" $final_path/variables.php @@ -59,7 +59,7 @@ sudo sed -i "s/yunoadmin/$admin/g" $final_path/variables.php sudo sed -i "s/I18NTOCHANGE/$language/g" $final_path/variables.php sudo sed -i "s@yunourl@$domain$path@g" $final_path/variables.php sudo sed -i "s@yunodomain@$domain@g" $final_path/variables.php -sudo sed -i "s/yunoinfolegal/$legal/g" $final_path/variables.php +sudo sed -i "s°yunoinfolegal°$legal°g" $final_path/variables.php # Create log file touch admin/logs_studs.txt diff --git a/sources/bandeaux.php b/sources/bandeaux.php index 7695dad..aa6e38a 100644 --- a/sources/bandeaux.php +++ b/sources/bandeaux.php @@ -83,11 +83,11 @@ function bandeau_tete() { if ( IMAGE_TITRE ) { - echo '
'.NOMAPPLICATION.'
'."\n"; + echo '
'.NOMAPPLICATION.'
'."\n"; } else { - echo '
'.NOMAPPLICATION.'
'."\n"; + echo '
'.NOMAPPLICATION.'
'."\n"; } ; @@ -168,11 +168,11 @@ function bandeau_pied() //echo '
'. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
'."\n"; echo '
 
'; echo '
' . - ''. _("Home") .'' . + ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . + ''. _("About") .'' . //''. _("Admin") .'' . '' . liste_lang() . ''. @@ -187,11 +187,11 @@ function bandeau_pied_mobile() '
'. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
'."\n";*/ echo '
 
'; echo '
' . - ''. _("Home") .'' . + ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . + ''. _("About") .'' . //''. _("Admin") .'' . '' . liste_lang() . ''. diff --git a/sources/bandeaux_local.php b/sources/bandeaux_local.php index 22e02dc..3bf1546 100644 --- a/sources/bandeaux_local.php +++ b/sources/bandeaux_local.php @@ -82,11 +82,11 @@ function bandeau_tete() { if ( IMAGE_TITRE ) { - echo '
'.NOMAPPLICATION.'
'."\n"; + echo '
'.NOMAPPLICATION.'
'."\n"; } else { - echo '
'.NOMAPPLICATION.'
'."\n"; + echo '
'.NOMAPPLICATION.'
'."\n"; } ; @@ -169,7 +169,7 @@ function bandeau_pied() echo '
' . ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . //''. _("Admin") .'' . @@ -188,7 +188,7 @@ function bandeau_pied_mobile() echo '
' . ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . //''. _("Admin") .'' . diff --git a/sources/i18n.php b/sources/i18n.php index 439fee7..0367df7 100644 --- a/sources/i18n.php +++ b/sources/i18n.php @@ -9,14 +9,13 @@ if (isset($_GET['lang']) && is_string($_GET['lang']) && in_array($_GET['lang'], $mlocale = LANGUE ; } -$locale = $mlocale . '.utf8'; -putenv('LANGUAGE='); -setlocale(LC_ALL, $locale); +$locale = $mlocale . '.UTF-8'; +putenv('LANGUAGE='.'C.UTF-8'); +setlocale(LC_ALL, 'C.UTF-8'); setlocale(LC_TIME, $locale); -setlocale(LC_MESSAGES, $locale); - +setlocale(LC_MESSAGES, 'C.UTF-8'); $domain = 'Studs'; -bindtextdomain($domain, 'locale'); +bindtextdomain($domain, 'locale/'.$mlocale); bind_textdomain_codeset($domain, 'UTF-8'); textdomain($domain); diff --git a/sources/locale/fr_FR/LC_MESSAGES/Studs.po b/sources/locale/fr_FR/LC_MESSAGES/Studs.po index 99d1a23..e643d98 100644 --- a/sources/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/sources/locale/fr_FR/LC_MESSAGES/Studs.po @@ -798,71 +798,71 @@ msgstr "Voir le sondage" msgid "Change the poll" msgstr "Modifier le sondage" -#~ msgid "Enter a name!" -#~ msgstr "Vous n'avez pas saisi de nom !" +~ msgid "Enter a name!" +~ msgstr "Vous n'avez pas saisi de nom !" -#~ msgid "monday" -#~ msgstr "lundi" +~ msgid "monday" +~ msgstr "lundi" -#~ msgid "tuesday" -#~ msgstr "mardi" +~ msgid "tuesday" +~ msgstr "mardi" -#~ msgid "wednesday" -#~ msgstr "mercredi" +~ msgid "wednesday" +~ msgstr "mercredi" -#~ msgid "thursday" -#~ msgstr "jeudi" +~ msgid "thursday" +~ msgstr "jeudi" -#~ msgid "friday" -#~ msgstr "vendredi" +~ msgid "friday" +~ msgstr "vendredi" -#~ msgid "saturday" -#~ msgstr "samedi" +~ msgid "saturday" +~ msgstr "samedi" -#~ msgid "sunday" -#~ msgstr "dimanche" +~ msgid "sunday" +~ msgstr "dimanche" -#~ msgid "january" -#~ msgstr "janvier" +~ msgid "january" +~ msgstr "janvier" -#~ msgid "february" -#~ msgstr "février" +~ msgid "february" +~ msgstr "février" -#~ msgid "march" -#~ msgstr "mars" +~ msgid "march" +~ msgstr "mars" -#~ msgid "april" -#~ msgstr "avril" +~ msgid "april" +~ msgstr "avril" -#~ msgid "may" -#~ msgstr "mai" +~ msgid "may" +~ msgstr "mai" -#~ msgid "june" -#~ msgstr "juin" +~ msgid "june" +~ msgstr "juin" -#~ msgid "july" -#~ msgstr "juillet" +~ msgid "july" +~ msgstr "juillet" -#~ msgid "august" -#~ msgstr "août" +~ msgid "august" +~ msgstr "août" -#~ msgid "september" -#~ msgstr "septembre" +~ msgid "september" +~ msgstr "septembre" -#~ msgid "october" -#~ msgstr "octobre" +~ msgid "october" +~ msgstr "octobre" -#~ msgid "november" -#~ msgstr "novembre" +~ msgid "november" +~ msgstr "novembre" -#~ msgid "december" -#~ msgstr "décembre" +~ msgid "december" +~ msgstr "décembre" -#~ msgid "Sources" -#~ msgstr "Sources" +~ msgid "Sources" +~ msgstr "Sources" -#~ msgid "Back" -#~ msgstr "Retour" +~ msgid "Back" +~ msgstr "Retour" #~ msgid "" #~ "Here are the '; -const IMAGE_TITRE = 'images/logo.png'; +const IMAGE_TITRE = './images/logo.png'; // Activation des URL propre (true pour activer, false sinon) const URL_PROPRE = false;