Fix language detection + update Catala localization

release-0.6
thomascube 17 years ago
parent 235086c7de
commit c3ab753765

@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
--------------------------- ---------------------------
2008/06/07 (thomasb)
----------
- Cleaned up localization names. Now named with lang_COUNTRY according to ISO 639-1/3166-1
- Updated Catala localization
2008/06/06 (robin) 2008/06/06 (robin)
---------- ----------
- Add option to log successful logins - Add option to log successful logins

@ -186,16 +186,16 @@ class rcmail
if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) { if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
$lang = $rcube_language_aliases[$lang]; $lang = $rcube_language_aliases[$lang];
} }
// try the first two chars // try the first two chars
else if (!isset($rcube_languages[$lang]) && strlen($lang) > 2) { else if (!isset($rcube_languages[$lang])) {
$short = $this->language_prop(substr($lang, 0, 2)); $short = $this->language_prop(substr($lang, 0, 2));
// check if we have an alias for the short language code // check if we have an alias for the short language code
if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) { if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
$lang = $rcube_language_aliases[$short]; $lang = $rcube_language_aliases[$short];
} }
else { // expand 'de' to 'de_DE' // expand 'nn' to 'nn_NN'
else if (!isset($rcube_languages[$short])) {
$lang = $short.'_'.strtoupper($short); $lang = $short.'_'.strtoupper($short);
} }
} }

@ -2,19 +2,19 @@
/* /*
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
| language/ca/labels.inc | | language/ca_ES/labels.inc |
| | | |
| Language file of the RoundCube Webmail client | | Language file of the RoundCube Webmail client |
| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland | | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL | | Licensed under the GNU GPL |
| | | |
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
| Author: Miguel Canteras i Cañizares <miguel@canteras.org> | | Author: Miguel Canteras i Cañizares <miguel@canteras.org> |
| Simo <sim6@graciasensefils.net> | | Simo <sim6@graciasensefils.net> |
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
@version $Id$ @version $Id$
*/ */
@ -69,6 +69,30 @@ $labels['wednesday'] = 'Dimecres';
$labels['thursday'] = 'Dijous'; $labels['thursday'] = 'Dijous';
$labels['friday'] = 'Divendres'; $labels['friday'] = 'Divendres';
$labels['saturday'] = 'Dissabte'; $labels['saturday'] = 'Dissabte';
$labels['jan'] = 'gen';
$labels['feb'] = 'feb';
$labels['mar'] = 'mar';
$labels['apr'] = 'abr';
$labels['may'] = 'mai';
$labels['jun'] = 'jun';
$labels['jul'] = 'jul';
$labels['aug'] = 'ago';
$labels['sep'] = 'set';
$labels['oct'] = 'oct';
$labels['nov'] = 'nov';
$labels['dec'] = 'des';
$labels['longjan'] = 'gener';
$labels['longfeb'] = 'febrer';
$labels['longmar'] = 'març';
$labels['longapr'] = 'abril';
$labels['longmay'] = 'maig';
$labels['longjun'] = 'juny';
$labels['longjul'] = 'juliol';
$labels['longaug'] = 'agost';
$labels['longsep'] = 'setembre';
$labels['longoct'] = 'octubre';
$labels['longnov'] = 'novembre';
$labels['longdec'] = 'desembre';
$labels['today'] = 'Avui'; $labels['today'] = 'Avui';
$labels['checkmail'] = 'Recupera missatges nous'; $labels['checkmail'] = 'Recupera missatges nous';
$labels['writenewmessage'] = 'Crear nou missatge'; $labels['writenewmessage'] = 'Crear nou missatge';
@ -172,6 +196,17 @@ $labels['dstactive'] = 'Horari d\'estiu';
$labels['htmleditor'] = 'Escriure missatges HTML'; $labels['htmleditor'] = 'Escriure missatges HTML';
$labels['htmlsignature'] = 'Signatura HTML'; $labels['htmlsignature'] = 'Signatura HTML';
$labels['previewpane'] = 'Mostrar el panell de previsualització'; $labels['previewpane'] = 'Mostrar el panell de previsualització';
$labels['logoutclear'] = 'Esborrar la paperera al tancar sessió';
$labels['logoutcompact'] = 'Compactar la safata d\'entrada al tancar sessió';
$labels['uisettings'] = 'Interfície d\'usuari';
$labels['serversettings'] = 'Configuració del servidor';
$labels['mailboxview'] = 'Vista de la bústia';
$labels['mdnrequests'] = 'Notificacions de recepció';
$labels['askuser'] = 'Pregunta-ho a l\'usuari';
$labels['autosend'] = 'Envia-les automàticament';
$labels['ignore'] = 'Ignora-les';
$labels['readwhendeleted'] = 'Marca el missatge com a llegit quan s\'esborri';
$labels['flagfordeletion'] = 'Afegeix marca d\'esborrat en comptes d\'esborrar-lo';
$labels['autosavedraft'] = 'Desar esborrany automàticament'; $labels['autosavedraft'] = 'Desar esborrany automàticament';
$labels['everynminutes'] = 'cada $n minuts'; $labels['everynminutes'] = 'cada $n minuts';
$labels['never'] = 'mai'; $labels['never'] = 'mai';

@ -2,19 +2,19 @@
/* /*
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
| language/ca/messages.inc | | language/ca_ES/messages.inc |
| | | |
| Language file of the RoundCube Webmail client | | Language file of the RoundCube Webmail client |
| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland | | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL | | Licensed under the GNU GPL |
| | | |
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
| Author: Miguel Canteras i Cañizares <miguel@canteras.org> | | Author: Miguel Canteras i Cañizares <miguel@canteras.org> |
| Simo <sim6@graciasensefils.net> | | Simo <sim6@graciasensefils.net> |
+-----------------------------------------------------------------------+ +-----------------------------------------------------------------------+
@version $Id$ @version $Id$
*/ */
@ -79,5 +79,6 @@ $messages['receiptsent'] = 'Confirmació de lectura enviada satisfactòriament';
$messages['errorsendingreceipt'] = 'No es pot enviar la confirmació'; $messages['errorsendingreceipt'] = 'No es pot enviar la confirmació';
$messages['nodeletelastidentity'] = 'No pots eliminar aquesta identitat, és l\'última.'; $messages['nodeletelastidentity'] = 'No pots eliminar aquesta identitat, és l\'última.';
$messages['addsubfolderhint'] = 'Aquesta carpeta serà creada com a subcarpeta de la seleccionada actualment'; $messages['addsubfolderhint'] = 'Aquesta carpeta serà creada com a subcarpeta de la seleccionada actualment';
$messages['forbiddencharacter'] = 'El nom de carpeta conté un caràcter prohibit';
?> ?>
Loading…
Cancel
Save