Merge branch 'omigeot-master'
This commit is contained in:
commit
0d161c6ef6
|
@ -32,9 +32,16 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
|
|||
* Get the language setting directly from system variables, bypassing get_config()
|
||||
* as database may not yet be configured.
|
||||
*
|
||||
* If possible, we use the value from the browser.
|
||||
*
|
||||
*/
|
||||
|
||||
$lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
|
||||
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
|
||||
$langs = preg_split("/[,-]/",$_SERVER['HTTP_ACCEPT_LANGUAGE'],2);
|
||||
$lang = $langs[0];
|
||||
} else {
|
||||
$lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
|
||||
}
|
||||
|
||||
load_translation_table($lang);
|
||||
|
||||
|
|
|
@ -16,14 +16,14 @@ $a->strings['last'] = 'last';
|
|||
$a->strings['next'] = 'next';
|
||||
$a->strings[' likes this.'] = ' aime ça.';
|
||||
$a->strings[' doesn\'t like this.'] = ' n\'aime pas ça.';
|
||||
$a->strings['people'] = 'personne(s)';
|
||||
$a->strings['like this.'] = 'aime(nt) ça.';
|
||||
$a->strings['don\'t like this.'] = 'n\'aime(nt) pas ça.';
|
||||
$a->strings['people'] = 'personnes';
|
||||
$a->strings['like this.'] = 'aiment ça.';
|
||||
$a->strings['don\'t like this.'] = 'n\'aiment pas ça.';
|
||||
$a->strings['and'] = 'et';
|
||||
$a->strings[', and '] = ', et ';
|
||||
$a->strings[' other people'] = ' autre(s) personne(s)';
|
||||
$a->strings[' like this.'] = ' aime(nt) ça.';
|
||||
$a->strings[' don\'t like this.'] = ' n\'aime(nt) pas ça.';
|
||||
$a->strings[' other people'] = ' autres personnes';
|
||||
$a->strings[' like this.'] = ' aiment ça.';
|
||||
$a->strings[' don\'t like this.'] = ' n\'aiment pas ça.';
|
||||
$a->strings['No contacts'] = 'Aucun contact';
|
||||
$a->strings['Contacts'] = 'Contacts';
|
||||
$a->strings['View Contacts'] = 'Voir les contacts';
|
||||
|
|
Loading…
Reference in a new issue