jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'omigeot-master'

Browse source
This commit is contained in:
Friendika 2011-03-13 19:13:40 -07:00
commit 0d161c6ef6
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
index.php
View file

@ -32,9 +32,16 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
* Get the language setting directly from system variables, bypassing get_config() * Get the language setting directly from system variables, bypassing get_config()
* as database may not yet be configured. * 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); load_translation_table($lang);

12
view/fr/strings.php
View file

@ -16,14 +16,14 @@ $a->strings['last'] = 'last';
$a->strings['next'] = 'next'; $a->strings['next'] = 'next';
$a->strings[' likes this.'] = ' aime ça.'; $a->strings[' likes this.'] = ' aime ça.';
$a->strings[' doesn\'t like this.'] = ' n\'aime pas ça.'; $a->strings[' doesn\'t like this.'] = ' n\'aime pas ça.';
$a->strings['people'] = 'personne(s)'; $a->strings['people'] = 'personnes';
$a->strings['like this.'] = 'aime(nt) ça.'; $a->strings['like this.'] = 'aiment ça.';
$a->strings['don\'t like this.'] = 'n\'aime(nt) pas ça.'; $a->strings['don\'t like this.'] = 'n\'aiment pas ça.';
$a->strings['and'] = 'et'; $a->strings['and'] = 'et';
$a->strings[', and '] = ', et '; $a->strings[', and '] = ', et ';
$a->strings[' other people'] = ' autre(s) personne(s)'; $a->strings[' other people'] = ' autres personnes';
$a->strings[' like this.'] = ' aime(nt) ça.'; $a->strings[' like this.'] = ' aiment ça.';
$a->strings[' don\'t like this.'] = ' n\'aime(nt) pas ça.'; $a->strings[' don\'t like this.'] = ' n\'aiment pas ça.';
$a->strings['No contacts'] = 'Aucun contact'; $a->strings['No contacts'] = 'Aucun contact';
$a->strings['Contacts'] = 'Contacts'; $a->strings['Contacts'] = 'Contacts';
$a->strings['View Contacts'] = 'Voir les contacts'; $a->strings['View Contacts'] = 'Voir les contacts';