From 820722f11388ee420b0517a4a8654b256d8d5dd6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Jan 2011 13:57:03 +0000 Subject: [PATCH] Fix: Trad of bookmarks --- htdocs/bookmarks/bookmarks.lib.php | 2 +- htdocs/bookmarks/langs/it_IT/bookmarks.lang | 13 ---------- htdocs/includes/modules/modBookmark.class.php | 2 +- .../langs/ar_AR/bookmarks.lang | 0 .../langs/ca_ES/bookmarks.lang | 0 .../langs/da_DA/bookmarks.lang | 0 .../langs/de_DE/bookmarks.lang | 0 .../langs/en_US/bookmarks.lang | 0 .../langs/es_ES/bookmarks.lang | 0 .../langs/fi_FI/bookmarks.lang | 0 .../langs/fr_FR/bookmarks.lang | 0 htdocs/langs/it_IT/bookmarks.lang | 26 +++++++++---------- .../langs/nl_BE/bookmarks.lang | 0 .../langs/nl_NL/bookmarks.lang | 0 .../langs/pl_PL/bookmarks.lang | 0 .../langs/pt_BR/bookmarks.lang | 0 .../langs/pt_PT/bookmarks.lang | 0 .../langs/ro_RO/bookmarks.lang | 0 .../langs/ru_RU/bookmarks.lang | 0 .../langs/tr_TR/bookmarks.lang | 0 20 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 htdocs/bookmarks/langs/it_IT/bookmarks.lang rename htdocs/{bookmarks => }/langs/ar_AR/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/ca_ES/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/da_DA/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/de_DE/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/en_US/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/es_ES/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/fi_FI/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/fr_FR/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/nl_BE/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/nl_NL/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/pl_PL/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/pt_BR/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/pt_PT/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/ro_RO/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/ru_RU/bookmarks.lang (100%) rename htdocs/{bookmarks => }/langs/tr_TR/bookmarks.lang (100%) diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 564500f2cc4..42f6cb9a72e 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -42,7 +42,7 @@ function printBookmarksList ($aDb, $aLangs) $bookm = new Bookmark($db); - $langs->load("bookmarks@bookmarks"); + $langs->load("bookmarks"); $url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:''); diff --git a/htdocs/bookmarks/langs/it_IT/bookmarks.lang b/htdocs/bookmarks/langs/it_IT/bookmarks.lang deleted file mode 100644 index b4f1f55aecc..00000000000 --- a/htdocs/bookmarks/langs/it_IT/bookmarks.lang +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Language code: it_IT - * Automatic generated via autotranslator.php tool - * Generation date 2009-08-13 20:49:18 - */ - -// START - Lines generated via autotranslator.php tool (2009-08-13 20:49:18). -// Reference language: en_US -CHARSET=UTF-8 -Bookm=Segnalibri -NewBookmark=Nuovo segnalibro -AddThisPageToBookmarks=Aggiungi questa pagina ai preferiti -// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:49:18). diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php index b82d9a53b1f..d86b8f3a523 100644 --- a/htdocs/includes/modules/modBookmark.class.php +++ b/htdocs/includes/modules/modBookmark.class.php @@ -67,7 +67,7 @@ class modBookmark extends DolibarrModules // Dependancies $this->depends = array(); $this->requiredby = array(); - $this->langfiles = array("@bookmarks"); + $this->langfiles = array("bookmarks"); // Config pages $this->config_page_url = array('bookmark.php@bookmarks'); diff --git a/htdocs/bookmarks/langs/ar_AR/bookmarks.lang b/htdocs/langs/ar_AR/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/ar_AR/bookmarks.lang rename to htdocs/langs/ar_AR/bookmarks.lang diff --git a/htdocs/bookmarks/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/ca_ES/bookmarks.lang rename to htdocs/langs/ca_ES/bookmarks.lang diff --git a/htdocs/bookmarks/langs/da_DA/bookmarks.lang b/htdocs/langs/da_DA/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/da_DA/bookmarks.lang rename to htdocs/langs/da_DA/bookmarks.lang diff --git a/htdocs/bookmarks/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/de_DE/bookmarks.lang rename to htdocs/langs/de_DE/bookmarks.lang diff --git a/htdocs/bookmarks/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/en_US/bookmarks.lang rename to htdocs/langs/en_US/bookmarks.lang diff --git a/htdocs/bookmarks/langs/es_ES/bookmarks.lang b/htdocs/langs/es_ES/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/es_ES/bookmarks.lang rename to htdocs/langs/es_ES/bookmarks.lang diff --git a/htdocs/bookmarks/langs/fi_FI/bookmarks.lang b/htdocs/langs/fi_FI/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/fi_FI/bookmarks.lang rename to htdocs/langs/fi_FI/bookmarks.lang diff --git a/htdocs/bookmarks/langs/fr_FR/bookmarks.lang b/htdocs/langs/fr_FR/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/fr_FR/bookmarks.lang rename to htdocs/langs/fr_FR/bookmarks.lang diff --git a/htdocs/langs/it_IT/bookmarks.lang b/htdocs/langs/it_IT/bookmarks.lang index acbd1b8e3d7..b4f1f55aecc 100644 --- a/htdocs/langs/it_IT/bookmarks.lang +++ b/htdocs/langs/it_IT/bookmarks.lang @@ -1,13 +1,13 @@ -/* - * Language code: it_IT - * Automatic generated via autotranslator.php tool - * Generation date 2009-08-13 20:49:18 - */ - -// START - Lines generated via autotranslator.php tool (2009-08-13 20:49:18). -// Reference language: en_US -CHARSET=UTF-8 -Bookm=Segnalibri -NewBookmark=Nuovo segnalibro -AddThisPageToBookmarks=Aggiungi questa pagina ai preferiti -// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:49:18). +/* + * Language code: it_IT + * Automatic generated via autotranslator.php tool + * Generation date 2009-08-13 20:49:18 + */ + +// START - Lines generated via autotranslator.php tool (2009-08-13 20:49:18). +// Reference language: en_US +CHARSET=UTF-8 +Bookm=Segnalibri +NewBookmark=Nuovo segnalibro +AddThisPageToBookmarks=Aggiungi questa pagina ai preferiti +// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:49:18). diff --git a/htdocs/bookmarks/langs/nl_BE/bookmarks.lang b/htdocs/langs/nl_BE/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/nl_BE/bookmarks.lang rename to htdocs/langs/nl_BE/bookmarks.lang diff --git a/htdocs/bookmarks/langs/nl_NL/bookmarks.lang b/htdocs/langs/nl_NL/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/nl_NL/bookmarks.lang rename to htdocs/langs/nl_NL/bookmarks.lang diff --git a/htdocs/bookmarks/langs/pl_PL/bookmarks.lang b/htdocs/langs/pl_PL/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/pl_PL/bookmarks.lang rename to htdocs/langs/pl_PL/bookmarks.lang diff --git a/htdocs/bookmarks/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/pt_BR/bookmarks.lang rename to htdocs/langs/pt_BR/bookmarks.lang diff --git a/htdocs/bookmarks/langs/pt_PT/bookmarks.lang b/htdocs/langs/pt_PT/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/pt_PT/bookmarks.lang rename to htdocs/langs/pt_PT/bookmarks.lang diff --git a/htdocs/bookmarks/langs/ro_RO/bookmarks.lang b/htdocs/langs/ro_RO/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/ro_RO/bookmarks.lang rename to htdocs/langs/ro_RO/bookmarks.lang diff --git a/htdocs/bookmarks/langs/ru_RU/bookmarks.lang b/htdocs/langs/ru_RU/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/ru_RU/bookmarks.lang rename to htdocs/langs/ru_RU/bookmarks.lang diff --git a/htdocs/bookmarks/langs/tr_TR/bookmarks.lang b/htdocs/langs/tr_TR/bookmarks.lang similarity index 100% rename from htdocs/bookmarks/langs/tr_TR/bookmarks.lang rename to htdocs/langs/tr_TR/bookmarks.lang