From fd6f1fdf614b6da3f3ed8b4f16ba7ee1252daee6 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Wed, 23 Feb 2011 17:44:40 +0000 Subject: improved i18n --- h-source/Application/Include/languages.php | 49 ++++++++++++++++++++++++++++-- h-source/Application/Models/WikiModel.php | 10 +++--- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 4bfb40e..d8e6502 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -194,8 +194,8 @@ class Lang "Talk" => "Discussione", "Talk page of the wiki page" => "Pagina di discussione della pagina della wiki", "a page with the same title already exists" => "esiste già una pagina con questo titolo", - "title is too length" => "il titolo è troppo lungo", - "the page text is too length" => "il testo della pagina è troppo lungo", + "title is too long" => "il titolo è troppo lungo", + "the page text is too long" => "il testo della pagina è troppo lungo", "History of the wiki page" => "History della pagina della wiki", "Would you like to insert it?" => "Vuoi inserirla?", "Wiki modifications" => "Modifiche alla Wiki", @@ -348,6 +348,51 @@ class Lang "Download the xml file of all the webcams in the database" => "Descargue el archivo xml de todas las cámaras web presentes en la base de datos", "You can download all the h-node database in one unique xml file in order to parse its contents by means of some proper script (for example a Python or Perl or PHP script)" => "Puede descargar toda la base de datos de h-node en un archivo xml único para poder analizarlo su contenido por medio de otro script apropiado (por ejemplo un script en Python, Perl o PHP)", "Download the h-node hardware database in xml format" => "Descargue la base de datos de h-node en formato xml", + "Database modifications" => "Modificaciones a la base de datos", + "List of the database modifications carried out by users" => "Lista de modificaciones realizada por los usuarios", + "the model" => "el modelo", + "has been inserted by" => "ha sido agregado por", + "has been updated by" => "ha sido modificado por", + "at" => "en", + "last modifications" => "ultimas modificaciones", + "watch all modifications" => "ver todas las modificaciones", + "the title" => "el titulo", + "the text of the wiki page" => "el texto de la página", + "the wiki page has not been found" => "la página del wiki no ha sido encontrada", + "Page not-found" => "Pagina no encontrada", + "Insert" => "Agregar", + "Update" => "Actualizar", + "History" => "Historial", + "Revision" => "Revisión", + "Differences" => "Diferencias", + "Insert a new wiki page" => "Agregar una página nueva al wiki", + "Edit the wiki page" => "Editar la página del wiki", + "Make current" => "Crear revisión actual", + "I want to make this revision the current revision" => "Quiero hacer ésta revisión la revisión actual", + "Confirm" => "Confirmar", + "Make this revision the current revision of the page" => "Hacer esta revisión la revisión actual de la página", + "This wiki page has been deleted" => "Ésta página del wiki ha sido borrada", + "Talk" => "Discusión", + "Talk page of the wiki page" => "Pagina de discusión de la página del wiki", + "a page with the same title already exists" => "una página con el mismo titulo ya existe", + "title is too long" => "el titulo es demasiado largo", + "the page text is too long" => "el texto de la página es demasiado largo", + "History of the wiki page" => "Historial de la página del wiki", + "Would you like to insert it?" => "¿Le gustaría agregarlo?", + "Wiki modifications" => "Modificaciones al Wiki", + "List of the wiki modifications carried out by users" => "Lista de modificaciones aportadas al Wiki por los usuarios", + "list of pages" => "lista de páginas", + "List of wiki pages" => "Lista de las páginas del wiki", + "This wiki page has been blocked" => "Ésta página del wiki ha sido bloqueada", + "unblock the wiki page" => "desbloquear la página", + "block the wiki page" => "bloquear la página", + "show the wiki page" => "mostrar la página del wiki", + "hide the wiki page" => "esconder la página del wiki", + "list of deleted pages" => "lista de las páginas borradas", + "restore the wiki page" => "restaurar la página", + "delete the wiki page" => "borrar la página", + "list of blocked pages" => "lista de las páginas bloqueadas", + "special pages" => "páginas especiales", ), 'fr' => array ( diff --git a/h-source/Application/Models/WikiModel.php b/h-source/Application/Models/WikiModel.php index 4021181..4c5e0d3 100644 --- a/h-source/Application/Models/WikiModel.php +++ b/h-source/Application/Models/WikiModel.php @@ -52,15 +52,17 @@ class WikiModel extends Model_Map { $this->fieldsWithBreaks = array(gtext('wiki page')); $this->strongConditions['insert'] = array( - "checkLength|99" => 'title|'.gtext('title is too length'), + "checkNotEmpty" => 'title', + "checkLength|99" => 'title|'.gtext('title is too long'), "+checkNotEmpty" => 'page', - "+checkLength|9000" => 'page|'.gtext('the page text is too length'), + "+checkLength|9000" => 'page|'.gtext('the page text is too long'), ); $this->strongConditions['update'] = array( - "checkLength|99" => 'title|'.gtext('title is too length'), + "checkNotEmpty" => 'title', + "checkLength|99" => 'title|'.gtext('title is too long'), "+checkNotEmpty" => 'page', - "+checkLength|9000" => 'page|'.gtext('the page text is too length'), + "+checkLength|9000" => 'page|'.gtext('the page text is too long'), ); $this->databaseConditions['insert'] = array( -- cgit v1.2.3