From b9d65e9d8e82713e04ebf1172d9c94fddb38df83 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 3 Apr 2011 21:55:50 +0200 Subject: Temporary conversion plugin for new fnencode FS#2197 This plugin converts existing filenames that were stored using the option "safe" in fnencode from using the dot (.) as post_indicator to using a bracket (]) as post_insdicator. It will also add a post_indicator at the end of the file name should it be missing (Bug FS#2122). This plugin needs testing by people using the safe encode option! --- lib/plugins/safefnrecode/action.php | 68 ++++++++++++++++++++++++++++++++ lib/plugins/safefnrecode/plugin.info.txt | 7 ++++ 2 files changed, 75 insertions(+) create mode 100644 lib/plugins/safefnrecode/action.php create mode 100644 lib/plugins/safefnrecode/plugin.info.txt (limited to 'lib/plugins') diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php new file mode 100644 index 000000000..6d869c532 --- /dev/null +++ b/lib/plugins/safefnrecode/action.php @@ -0,0 +1,68 @@ + + */ + +// must be run within Dokuwiki +if (!defined('DOKU_INC')) die(); + +require_once DOKU_PLUGIN.'action.php'; + +class action_plugin_safefnrecode extends DokuWiki_Action_Plugin { + + public function register(Doku_Event_Handler &$controller) { + + $controller->register_hook('INDEXER_TASKS_RUN', 'BEFORE', $this, 'handle_indexer_tasks_run'); + + } + + public function handle_indexer_tasks_run(Doku_Event &$event, $param) { + global $conf; + if($conf['fnencode'] != 'safe') return; + + if(!file_exists($conf['datadir'].'_safefn.recoded')){ + $this->recode($conf['datadir']); + touch($conf['datadir'].'_safefn.recoded'); + } + + if(!file_exists($conf['olddir'].'_safefn.recoded')){ + $this->recode($conf['olddir']); + touch($conf['olddir'].'_safefn.recoded'); + } + + if(!file_exists($conf['metadir'].'_safefn.recoded')){ + $this->recode($conf['metadir']); + touch($conf['metadir'].'_safefn.recoded'); + } + + if(!file_exists($conf['mediadir'].'_safefn.recoded')){ + $this->recode($conf['metadir']); + touch($conf['metadir'].'_safefn.recoded'); + } + + } + + /** + * Recursive function to rename all safe encoded files to use the new + * square bracket post indicator + */ + private function recode($dir){ + $dh = opendir($dir); + if(!$dh) return; + while (($file = readdir($dh)) !== false) { + if($file == '.' || $file == '..') continue; # cur and upper dir + if(is_dir("$dir/$file")) $this->recode("$dir/$file"); #recurse + if(strpos('%',$file) === false) continue; # no encoding used + $new = preg_replace('/(%.*?)\./','\1]',$file); # new post indicator + if(preg_match('/%[^\.]+$/',$new)) $new .= ']'; # fix end FS#2122 + rename("$dir/$file","$dir/$new"); # rename it + } + closedir($dh); + } + +} + +// vim:ts=4:sw=4:et: diff --git a/lib/plugins/safefnrecode/plugin.info.txt b/lib/plugins/safefnrecode/plugin.info.txt new file mode 100644 index 000000000..b1600060c --- /dev/null +++ b/lib/plugins/safefnrecode/plugin.info.txt @@ -0,0 +1,7 @@ +base safefnrecode +author Andreas Gohr +email andi@splitbrain.org +date 2011-04-03 +name safefnrecode plugin +desc Changes existing page and foldernames for the change in the safe filename encoding +url http://www.dokuwiki.org/plugin:safefnrecode -- cgit v1.2.3 From aa235a708b8f394fab1d95f4c5a3cf23cabffd02 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 3 Apr 2011 22:02:27 +0200 Subject: fix end indicator fix --- lib/plugins/safefnrecode/action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php index 6d869c532..4fa5530df 100644 --- a/lib/plugins/safefnrecode/action.php +++ b/lib/plugins/safefnrecode/action.php @@ -57,7 +57,7 @@ class action_plugin_safefnrecode extends DokuWiki_Action_Plugin { if(is_dir("$dir/$file")) $this->recode("$dir/$file"); #recurse if(strpos('%',$file) === false) continue; # no encoding used $new = preg_replace('/(%.*?)\./','\1]',$file); # new post indicator - if(preg_match('/%[^\.]+$/',$new)) $new .= ']'; # fix end FS#2122 + if(preg_match('/%[^\]]+$/',$new)) $new .= ']'; # fix end FS#2122 rename("$dir/$file","$dir/$new"); # rename it } closedir($dh); -- cgit v1.2.3 From 903e5bc8f1bbb8bd5c9238c020882b571bb8ea85 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 3 Apr 2011 22:06:34 +0200 Subject: safefnrecode: don't double fix filenames --- lib/plugins/safefnrecode/action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php index 4fa5530df..76d02e4c7 100644 --- a/lib/plugins/safefnrecode/action.php +++ b/lib/plugins/safefnrecode/action.php @@ -56,7 +56,7 @@ class action_plugin_safefnrecode extends DokuWiki_Action_Plugin { if($file == '.' || $file == '..') continue; # cur and upper dir if(is_dir("$dir/$file")) $this->recode("$dir/$file"); #recurse if(strpos('%',$file) === false) continue; # no encoding used - $new = preg_replace('/(%.*?)\./','\1]',$file); # new post indicator + $new = preg_replace('/(%[^\]]*?)\./','\1]',$file); # new post indicator if(preg_match('/%[^\]]+$/',$new)) $new .= ']'; # fix end FS#2122 rename("$dir/$file","$dir/$new"); # rename it } -- cgit v1.2.3 From f7f0e633f735842dfb466878eef440245a9bd3e1 Mon Sep 17 00:00:00 2001 From: Myron Turner Date: Wed, 6 Apr 2011 22:00:00 +0200 Subject: fixed two errors in safefnrecode plugin --- lib/plugins/safefnrecode/action.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php index 76d02e4c7..5d3eaae3a 100644 --- a/lib/plugins/safefnrecode/action.php +++ b/lib/plugins/safefnrecode/action.php @@ -39,8 +39,8 @@ class action_plugin_safefnrecode extends DokuWiki_Action_Plugin { } if(!file_exists($conf['mediadir'].'_safefn.recoded')){ - $this->recode($conf['metadir']); - touch($conf['metadir'].'_safefn.recoded'); + $this->recode($conf['mediadir']); + touch($conf['mediadir'].'_safefn.recoded'); } } @@ -55,7 +55,7 @@ class action_plugin_safefnrecode extends DokuWiki_Action_Plugin { while (($file = readdir($dh)) !== false) { if($file == '.' || $file == '..') continue; # cur and upper dir if(is_dir("$dir/$file")) $this->recode("$dir/$file"); #recurse - if(strpos('%',$file) === false) continue; # no encoding used + if(strpos($file,'%') === false) continue; # no encoding used $new = preg_replace('/(%[^\]]*?)\./','\1]',$file); # new post indicator if(preg_match('/%[^\]]+$/',$new)) $new .= ']'; # fix end FS#2122 rename("$dir/$file","$dir/$new"); # rename it -- cgit v1.2.3 From 8e65cd510bfa93eba1b847b6cbea1764fad480af Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Fri, 1 Apr 2011 19:56:32 +0200 Subject: Finnish language update --- lib/plugins/config/lang/fi/lang.php | 2 +- lib/plugins/plugin/lang/fi/lang.php | 2 +- lib/plugins/popularity/lang/fi/lang.php | 5 +++++ lib/plugins/popularity/lang/fi/submitted.txt | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 lib/plugins/popularity/lang/fi/submitted.txt (limited to 'lib/plugins') diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index b033e312b..5a167c9aa 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -97,7 +97,7 @@ $lang['canonical'] = 'Käytä kanonisoituja URLeja'; $lang['fnencode'] = 'Muita kuin ASCII merkkejä sisältävien tiedostonimien koodaustapa.'; $lang['autoplural'] = 'Etsi monikkomuotoja linkeistä'; $lang['compression'] = 'Attic-tiedostojen pakkausmenetelmä'; -$lang['cachetime'] = 'Välimuisti-tiedostojen maksimi-ikä (sek)'; +$lang['cachetime'] = 'Välimuisti-tiedostojen maksimi ikä (sek)'; $lang['locktime'] = 'Lukitustiedostojen maksimi-ikä (sek)'; $lang['fetchsize'] = 'Suurin koko (bytejä), jonka fetch.php voi ladata ulkopuolisesta lähteestä'; $lang['notify'] = 'Lähetä muutosilmoitukset tähän osoitteeseen'; diff --git a/lib/plugins/plugin/lang/fi/lang.php b/lib/plugins/plugin/lang/fi/lang.php index 817b4f20a..b4c95c56d 100644 --- a/lib/plugins/plugin/lang/fi/lang.php +++ b/lib/plugins/plugin/lang/fi/lang.php @@ -44,7 +44,7 @@ $lang['error_download'] = 'Liitännäistiedoston %s latauksessa tapahtui $lang['error_badurl'] = 'URL vaikuttaa olleen virheellinen. Siitä ei pystytty päättelemään tiedoston nimeä'; $lang['error_dircreate'] = 'Ei pystytty luomaan väliaikaista hakemistoa latausta varten'; $lang['error_decompress'] = 'Liitännäishallinta ei pystynyt purkamaan ladattua tiedostoa. Lataus voi olla epäonnistunut. Siinä tapauksessa voit yrittää uudestaan. Pakkaustapa voi myös olla tuntematon. Siinä tapauksessa sinun pitää ladata ja asentaa liitännäinen käsin.'; -$lang['error_copy'] = 'Tiedoston kopioinnissa tapahtui liitännäisen %s asennuksen aikana virhe. Levy voi olla täynnä tai kansioiden oikeudet voivat olla väärin. Liitännäinen voi olla osittain asennettu ja tämä voi jättää wikiasennukseesi epävakaaseen tilaan.'; +$lang['error_copy'] = 'Tiedoston kopioinnissa tapahtui liitännäisen %s asennuksen aikana virhe. Levy voi olla täynnä tai kansioiden oikeudet voivat olla väärin. Liitännäinen voi olla osittain asennettu ja tämä voi jättää wikisi epävakaaseen tilaan.'; $lang['error_delete'] = 'Liitännäisen %s poistossa tapahtui virhe. Todennäköisin syy on puutteelliset tiedoston tai hakemiston oikeudet'; $lang['enabled'] = 'Liitännäinen %s käytössä'; $lang['notenabled'] = 'Liitännäistä %s ei voitu ottaa käyttöön. Tarkista tiedostojen oikeudet.'; diff --git a/lib/plugins/popularity/lang/fi/lang.php b/lib/plugins/popularity/lang/fi/lang.php index 3aa5dc23b..dca4aa909 100644 --- a/lib/plugins/popularity/lang/fi/lang.php +++ b/lib/plugins/popularity/lang/fi/lang.php @@ -7,3 +7,8 @@ */ $lang['name'] = 'Suosion palaute (voi kestää jonkun aikaa latautua)'; $lang['submit'] = 'Lähetä tiedot'; +$lang['autosubmit'] = 'Lähetä tiedot automaattisesti kerran kuussa'; +$lang['submissionFailed'] = 'Tietoja ei voitu lähettää seuraavan virheen vuoksi:'; +$lang['submitDirectly'] = 'Voit lähettää tiedot manuaalisesti.'; +$lang['autosubmitError'] = 'Edellinen automaattinen lähetys epäonnistui seuraavan virheen vuoksi:'; +$lang['lastSent'] = 'Tiedot on nyt lähettetty.'; diff --git a/lib/plugins/popularity/lang/fi/submitted.txt b/lib/plugins/popularity/lang/fi/submitted.txt new file mode 100644 index 000000000..b36e7eb23 --- /dev/null +++ b/lib/plugins/popularity/lang/fi/submitted.txt @@ -0,0 +1,3 @@ +====== Suosion palaute ====== + +Tiedot on nyt lähetetty onnistuneesti. \ No newline at end of file -- cgit v1.2.3 From dd5aedfa30ea1210c38697bb39fb945033cf806b Mon Sep 17 00:00:00 2001 From: Constantinos Xanthopoulos Date: Sat, 16 Apr 2011 09:17:55 +0200 Subject: French language update --- lib/plugins/config/lang/fr/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 99e140af5..f5a8da0e2 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -103,7 +103,7 @@ $lang['useslash'] = 'Utiliser « / » comme séparateur de catég $lang['usedraft'] = 'Enregistrer automatiquement un brouillon pendant l\'édition'; $lang['sepchar'] = 'Séparateur de mots dans les noms de page'; $lang['canonical'] = 'Utiliser des URL canoniques'; -$lang['fnencode'] = 'Méhtode pou r l\'encodage des fichiers non-ASCII'; +$lang['fnencode'] = 'Méthode pour l\'encodage des fichiers non-ASCII'; $lang['autoplural'] = 'Rechercher les formes plurielles dans les liens'; $lang['compression'] = 'Méthode de compression pour les fichiers dans attic'; $lang['cachetime'] = 'Âge maximum d\'un fichier en cache (en secondes)'; -- cgit v1.2.3 From 7b89361c0d7aaa6bdf28c200aa93fc8f1435cad9 Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Sat, 16 Apr 2011 09:18:56 +0200 Subject: Finnish language update --- lib/plugins/config/lang/fi/lang.php | 3 ++- lib/plugins/plugin/lang/fi/lang.php | 2 +- lib/plugins/popularity/lang/fi/lang.php | 6 +++--- lib/plugins/popularity/lang/fi/submitted.txt | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index 5a167c9aa..a4c0fbb85 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -97,12 +97,13 @@ $lang['canonical'] = 'Käytä kanonisoituja URLeja'; $lang['fnencode'] = 'Muita kuin ASCII merkkejä sisältävien tiedostonimien koodaustapa.'; $lang['autoplural'] = 'Etsi monikkomuotoja linkeistä'; $lang['compression'] = 'Attic-tiedostojen pakkausmenetelmä'; -$lang['cachetime'] = 'Välimuisti-tiedostojen maksimi ikä (sek)'; +$lang['cachetime'] = 'Välimuisti-tiedostojen maksimi-ikä (sek)'; $lang['locktime'] = 'Lukitustiedostojen maksimi-ikä (sek)'; $lang['fetchsize'] = 'Suurin koko (bytejä), jonka fetch.php voi ladata ulkopuolisesta lähteestä'; $lang['notify'] = 'Lähetä muutosilmoitukset tähän osoitteeseen'; $lang['registernotify'] = 'Lähetä ilmoitus uusista rekisteröitymisistä tähän osoitteeseen'; $lang['mailfrom'] = 'Sähköpostiosoite automaattisia postituksia varten'; +$lang['mailprefix'] = 'Etuliite automaattisesti lähetettyihin dähköposteihin'; $lang['gzip_output'] = 'Käytä gzip "Content-Encoding"-otsaketta xhtml-tiedostojen lähettämiseen'; $lang['gdlib'] = 'GD Lib versio'; $lang['im_convert'] = 'ImageMagick-muunnostyökalun polku'; diff --git a/lib/plugins/plugin/lang/fi/lang.php b/lib/plugins/plugin/lang/fi/lang.php index b4c95c56d..817b4f20a 100644 --- a/lib/plugins/plugin/lang/fi/lang.php +++ b/lib/plugins/plugin/lang/fi/lang.php @@ -44,7 +44,7 @@ $lang['error_download'] = 'Liitännäistiedoston %s latauksessa tapahtui $lang['error_badurl'] = 'URL vaikuttaa olleen virheellinen. Siitä ei pystytty päättelemään tiedoston nimeä'; $lang['error_dircreate'] = 'Ei pystytty luomaan väliaikaista hakemistoa latausta varten'; $lang['error_decompress'] = 'Liitännäishallinta ei pystynyt purkamaan ladattua tiedostoa. Lataus voi olla epäonnistunut. Siinä tapauksessa voit yrittää uudestaan. Pakkaustapa voi myös olla tuntematon. Siinä tapauksessa sinun pitää ladata ja asentaa liitännäinen käsin.'; -$lang['error_copy'] = 'Tiedoston kopioinnissa tapahtui liitännäisen %s asennuksen aikana virhe. Levy voi olla täynnä tai kansioiden oikeudet voivat olla väärin. Liitännäinen voi olla osittain asennettu ja tämä voi jättää wikisi epävakaaseen tilaan.'; +$lang['error_copy'] = 'Tiedoston kopioinnissa tapahtui liitännäisen %s asennuksen aikana virhe. Levy voi olla täynnä tai kansioiden oikeudet voivat olla väärin. Liitännäinen voi olla osittain asennettu ja tämä voi jättää wikiasennukseesi epävakaaseen tilaan.'; $lang['error_delete'] = 'Liitännäisen %s poistossa tapahtui virhe. Todennäköisin syy on puutteelliset tiedoston tai hakemiston oikeudet'; $lang['enabled'] = 'Liitännäinen %s käytössä'; $lang['notenabled'] = 'Liitännäistä %s ei voitu ottaa käyttöön. Tarkista tiedostojen oikeudet.'; diff --git a/lib/plugins/popularity/lang/fi/lang.php b/lib/plugins/popularity/lang/fi/lang.php index dca4aa909..a73f63501 100644 --- a/lib/plugins/popularity/lang/fi/lang.php +++ b/lib/plugins/popularity/lang/fi/lang.php @@ -9,6 +9,6 @@ $lang['name'] = 'Suosion palaute (voi kestää jonkun aikaa lat $lang['submit'] = 'Lähetä tiedot'; $lang['autosubmit'] = 'Lähetä tiedot automaattisesti kerran kuussa'; $lang['submissionFailed'] = 'Tietoja ei voitu lähettää seuraavan virheen vuoksi:'; -$lang['submitDirectly'] = 'Voit lähettää tiedot manuaalisesti.'; -$lang['autosubmitError'] = 'Edellinen automaattinen lähetys epäonnistui seuraavan virheen vuoksi:'; -$lang['lastSent'] = 'Tiedot on nyt lähettetty.'; +$lang['submitDirectly'] = 'Voit lähettää tiedot käsin seuraavan kaavakkeen avulla'; +$lang['autosubmitError'] = 'Edellinen automaattilähetys epäonnistui seuraavan virheen vuoksi:'; +$lang['lastSent'] = 'Tiedot on lähetetty'; diff --git a/lib/plugins/popularity/lang/fi/submitted.txt b/lib/plugins/popularity/lang/fi/submitted.txt index b36e7eb23..31059c880 100644 --- a/lib/plugins/popularity/lang/fi/submitted.txt +++ b/lib/plugins/popularity/lang/fi/submitted.txt @@ -1,3 +1,3 @@ ====== Suosion palaute ====== -Tiedot on nyt lähetetty onnistuneesti. \ No newline at end of file +Tiedot lähetettiin onnistuneesti. \ No newline at end of file -- cgit v1.2.3 From 116065d2d8aa1613c8b90b01606efacc4fe846d1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 16 Apr 2011 11:54:47 +0200 Subject: fix ACL preview for users with special chars FS#2206 The user was nameencoded twice. --- lib/plugins/acl/admin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 3e7bd8121..8ca602533 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -17,7 +17,7 @@ if(!defined('DOKU_INC')) die(); class admin_plugin_acl extends DokuWiki_Admin_Plugin { var $acl = null; var $ns = null; - /** + /** * The currently selected item, associative array with id and type. * Populated from (in this order): * $_REQUEST['current_ns'] @@ -37,7 +37,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { return array( 'author' => 'Andreas Gohr', 'email' => 'andi@splitbrain.org', - 'date' => '2010-01-17', + 'date' => '2011-04-16', 'name' => 'ACL Manager', 'desc' => 'Manage Page Access Control Lists', 'url' => 'http://dokuwiki.org/plugin:acl', @@ -449,7 +449,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $user = ''; $groups = array(ltrim($who,'@')); }else{ - $user = auth_nameencode($who); + $user = $who; $info = $auth->getUserData($user); if($info === false){ $groups = array(); @@ -521,7 +521,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } // highlight? - if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) + if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) $cl = ' cur'; // namespace or page? -- cgit v1.2.3 From ecd7c1d6b68a5f3eeef348295558dfaa14c471b2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 16 Apr 2011 12:21:26 +0100 Subject: avoid empty optgroup in acl admin --- lib/plugins/acl/admin.php | 64 +++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 30 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 8ca602533..c8b7b1e6e 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -800,38 +800,42 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; return $inlist; } -- cgit v1.2.3 From 6cd259d7de1e82b753b5b7ce593637e58b36288b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 16 Apr 2011 12:25:08 +0100 Subject: closed hidden input in popularity plugin --- lib/plugins/popularity/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php index 40c3f5452..f9f6ceb65 100644 --- a/lib/plugins/popularity/admin.php +++ b/lib/plugins/popularity/admin.php @@ -137,8 +137,8 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { .($this->helper->isAutosubmitEnabled() ? 'checked' : '' ) .'/>' . $this->getLang('autosubmit') .'
' .'' - .'' - .''; + .'' + .''; } $form .= '' .'' -- cgit v1.2.3 From d8f5fe8a1b2231ff584f43c25217b16950600656 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Sat, 16 Apr 2011 14:37:13 +0200 Subject: eo: updates for esperanto language --- lib/plugins/config/lang/eo/lang.php | 1 + lib/plugins/popularity/lang/eo/lang.php | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index b519aa4e3..a3b74691f 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -108,6 +108,7 @@ $lang['fetchsize'] = 'Maksimuma grandeco (bitokoj) permesita al "fet $lang['notify'] = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso'; $lang['registernotify'] = 'Sendi informon pri ĵus aliĝintoj al tiu ĉi retadreso'; $lang['mailfrom'] = 'Retadreso uzota por aŭtomataj retmesaĝoj '; +$lang['mailprefix'] = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj'; $lang['gzip_output'] = 'Uzi gzip-a enhav-enkodigo por XHTML'; $lang['gdlib'] = 'Versio de GD Lib'; $lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php index 9326cc741..a7c124f51 100644 --- a/lib/plugins/popularity/lang/eo/lang.php +++ b/lib/plugins/popularity/lang/eo/lang.php @@ -12,3 +12,8 @@ */ $lang['name'] = 'Populareca enketo (eble la ŝargo prokrastos iomete)'; $lang['submit'] = 'Sendi datenaron'; +$lang['autosubmit'] = 'Aŭtomate sendi datumaron monate'; +$lang['submissionFailed'] = 'La datumaro ne povis esti sendata pro la jena eraro:'; +$lang['submitDirectly'] = 'Vi povas sendi vi mem la datumaron per la sekva informilo.'; +$lang['autosubmitError'] = 'La lasta aŭtomata sendo malsukcesis, pro la jena eraro:'; +$lang['lastSent'] = 'La datumaro estas sendita'; -- cgit v1.2.3 From f4ca4fedd6f501293173d2ab4b4a730f75d4c467 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sat, 16 Apr 2011 15:14:19 +0200 Subject: Removed hard coded strings from plugin manager --- lib/plugins/plugin/classes/ap_delete.class.php | 2 +- lib/plugins/plugin/classes/ap_download.class.php | 2 +- lib/plugins/plugin/lang/en/lang.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/classes/ap_delete.class.php b/lib/plugins/plugin/classes/ap_delete.class.php index 231147479..581a6295f 100644 --- a/lib/plugins/plugin/classes/ap_delete.class.php +++ b/lib/plugins/plugin/classes/ap_delete.class.php @@ -6,7 +6,7 @@ class ap_delete extends ap_manage { if (!$this->dir_delete(DOKU_PLUGIN.plugin_directory($this->manager->plugin))) { $this->manager->error = sprintf($this->lang['error_delete'],$this->manager->plugin); } else { - msg("Plugin {$this->manager->plugin} successfully deleted."); + msg(sprintf($this->lang['deleted'],$this->plugin)); $this->refresh(); } } diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index 784095aaf..e3afd142a 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -114,7 +114,7 @@ class ap_download extends ap_manage { if ($tmp) $this->dir_delete($tmp); if (!$this->manager->error) { - msg('Plugin package ('.count($this->downloaded).' plugin'.(count($this->downloaded) != 1?'s':'').': '.join(',',$this->downloaded).') successfully installed.',1); + msg(sprintf($this->lang['packageinstalled'], count($this->downloaded), (count($this->downloaded) != 1?'s':''), join(',',$this->downloaded)),1); $this->refresh(); return true; } diff --git a/lib/plugins/plugin/lang/en/lang.php b/lib/plugins/plugin/lang/en/lang.php index ccbd207e9..437c168bd 100644 --- a/lib/plugins/plugin/lang/en/lang.php +++ b/lib/plugins/plugin/lang/en/lang.php @@ -73,5 +73,6 @@ $lang['enabled'] = 'Plugin %s enabled.'; $lang['notenabled'] = 'Plugin %s could not be enabled, check file permissions.'; $lang['disabled'] = 'Plugin %s disabled.'; $lang['notdisabled'] = 'Plugin %s could not be disabled, check file permissions.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) successfully installed.'; //Setup VIM: ex: et ts=4 : -- cgit v1.2.3 From ff9a8d11b604e75395a9dd4d0d3700653a2adf1f Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sat, 16 Apr 2011 15:15:25 +0200 Subject: French strings update --- lib/plugins/plugin/lang/fr/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index 5daf3b3ad..618e7a75b 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -61,3 +61,4 @@ $lang['enabled'] = 'Module %s activé.'; $lang['notenabled'] = 'Le module %s n\'a pas pu être activé, vérifiez le fichier des permissions.'; $lang['disabled'] = 'Module %s désactivé.'; $lang['notdisabled'] = 'Le module %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.'; +$lang['packageinstalled'] = 'Ensemble de modules (%d module%s: %s) installé avec succès.'; -- cgit v1.2.3 From 23ae1b94a29fd9c3219a8cb37f3f2e21fbe03bc6 Mon Sep 17 00:00:00 2001 From: Kiril Velikov Date: Sun, 17 Apr 2011 08:55:59 +0200 Subject: Bulgarian language update --- lib/plugins/acl/lang/bg/lang.php | 2 +- lib/plugins/config/lang/bg/lang.php | 8 ++++---- lib/plugins/plugin/lang/bg/admin_plugin.txt | 2 +- lib/plugins/revert/lang/bg/intro.txt | 2 +- lib/plugins/usermanager/lang/bg/lang.php | 4 ++-- lib/plugins/usermanager/lang/bg/list.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/bg/lang.php b/lib/plugins/acl/lang/bg/lang.php index 2b956deba..0746e32c9 100644 --- a/lib/plugins/acl/lang/bg/lang.php +++ b/lib/plugins/acl/lang/bg/lang.php @@ -24,7 +24,7 @@ $lang['p_inherited'] = 'Бележка: Тези разрешения $lang['p_isadmin'] = 'Бележка: Избраната група или потребител има всички права, защото е определен за суперпотребител.'; $lang['p_include'] = 'Висши права включват по-нисшите такива. Правата за създаване, качване и изтриване са приложими само за именни пространства, но не за страници.'; $lang['current'] = 'Текущи ACL права'; -$lang['where'] = 'Страница/Именно постранство'; +$lang['where'] = 'Страница/Именно пространство'; $lang['who'] = 'Потребител/Група'; $lang['perm'] = 'Права'; $lang['acl_perm0'] = 'Никакви'; diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index eb2c3a426..5f9088c3e 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -8,11 +8,11 @@ * @author Kiril */ $lang['menu'] = 'Настройки'; -$lang['error'] = 'Обновяването на настройките е невъзможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново. +$lang['error'] = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново.
Неверните стойности ще бъдат обградени с червена рамка.'; $lang['updated'] = 'Обновяването на настройките е успешно.'; $lang['nochoice'] = '(няма друг възможен избор)'; -$lang['locked'] = 'Обновяването на файла с настройките е невъзможно, ако това не е нарочно, проверете,
дали името на локалния файл с настройки и правата са верни.'; +$lang['locked'] = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,
дали името на локалния файл с настройки и правата са верни.'; $lang['danger'] = 'Внимание: промяна на опцията може да направи wiki-то и менюто за настройване недостъпни.'; $lang['warning'] = 'Предупреждение: промяна на опцията може предизвика нежелани последици.'; $lang['security'] = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.'; @@ -84,8 +84,8 @@ $lang['disableactions_subscription'] = 'Записване/Отписване'; $lang['disableactions_wikicode'] = 'Преглед на кода/Експортиране на оригинална версия'; $lang['disableactions_other'] = 'Други действия (разделени със запетая)'; $lang['sneaky_index'] = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. '; -$lang['auth_security_timeout'] = 'Считане на вписване за неуспешно след (сек)'; -$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване в системата, а четенето е възможно и без SSL. +$lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)'; +$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL. '; $lang['xmlrpc'] = 'Включване/Изключване на интерфейса XML-RPC.'; $lang['xmlrpcuser'] = 'Ограничаване на XML-RPC достъпа до отделени със запетая групи или потребители. Оставете празно, за да даде достъп на всеки.'; diff --git a/lib/plugins/plugin/lang/bg/admin_plugin.txt b/lib/plugins/plugin/lang/bg/admin_plugin.txt index 0227d6fe8..bad73e136 100644 --- a/lib/plugins/plugin/lang/bg/admin_plugin.txt +++ b/lib/plugins/plugin/lang/bg/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Управление на приставките ====== -На тази страница можете на управлявате всичко свързано с [[doku>plugins|приставките]] на Dokuwiki. За да можете да свалите и инсталирате приставка, е необходимо писането в директорията plugin да е позволено на сървъра. +От тази страница можете на управлявате [[doku>plugins|приставките]] на Dokuwiki. За да свалите и инсталирате приставка, е необходимо писането в директорията .../lib/plugins/ да е позволено на сървъра. diff --git a/lib/plugins/revert/lang/bg/intro.txt b/lib/plugins/revert/lang/bg/intro.txt index 791c96857..44d5a0938 100644 --- a/lib/plugins/revert/lang/bg/intro.txt +++ b/lib/plugins/revert/lang/bg/intro.txt @@ -1,4 +1,4 @@ ====== Възстановяване ====== -Страницата помага за автоматично възстановяване след SPAM атака. За да намерите списък със спамнати страници, въведете текст за търсене (напр. линк от SPAM съобщението), след това потвърдете, че намерените страници са наистина SPAM и възстановете старите версии. +Страницата помага за автоматично възстановяване след SPAM атака. За да намерите спамнатите страници, въведете текст за търсене (напр. линк от SPAM съобщението), след това потвърдете, че намерените страници са наистина SPAM и възстановете старите им версии. diff --git a/lib/plugins/usermanager/lang/bg/lang.php b/lib/plugins/usermanager/lang/bg/lang.php index 909c1e8fe..9ed27f42a 100644 --- a/lib/plugins/usermanager/lang/bg/lang.php +++ b/lib/plugins/usermanager/lang/bg/lang.php @@ -45,5 +45,5 @@ $lang['note_group'] = 'Новите потребители биват $lang['note_pass'] = 'Паролата ще бъде генерирана автоматично, ако оставите полето празно и функцията за уведомяване на потребителя е включена.'; $lang['add_ok'] = 'Добавянето на потребителя е успешно'; $lang['add_fail'] = 'Добавянето на потребителя се провали'; -$lang['notify_ok'] = 'Осведомително е-писмо бе изпратено'; -$lang['notify_fail'] = 'Пращането на осведомително е-писмо е невъзможно'; +$lang['notify_ok'] = 'Изпратено е осведомително ел. писмо'; +$lang['notify_fail'] = 'Изпращането на осведомително ел. писмо не е възможно'; diff --git a/lib/plugins/usermanager/lang/bg/list.txt b/lib/plugins/usermanager/lang/bg/list.txt index e90205fe6..106856c0e 100644 --- a/lib/plugins/usermanager/lang/bg/list.txt +++ b/lib/plugins/usermanager/lang/bg/list.txt @@ -1 +1 @@ -===== Списък с потребителите ===== +===== Списък на потребителите ===== -- cgit v1.2.3 From f24af5915f464b0df29700b68b51a16ac41aeabf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 17 Apr 2011 11:14:45 +0100 Subject: tiny fixes for xhtml strict --- lib/plugins/config/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index d245d3fce..e24f3b87b 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -113,7 +113,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // rewrite config is broken. Add $ID as hidden field to remember // current ID in most cases. ptln('
'); - ptln(''); + ptln('
'); formSecurityToken(); $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki')); -- cgit v1.2.3 From f76f425eb307e0ab1a44dc2808da622fd752ae36 Mon Sep 17 00:00:00 2001 From: Yuji TAKENAKA Date: Sun, 17 Apr 2011 16:17:48 +0200 Subject: Japanese update Signed-off-by: Guy Brand --- lib/plugins/config/lang/ja/lang.php | 1 + lib/plugins/plugin/lang/ja/lang.php | 1 + lib/plugins/popularity/lang/ja/lang.php | 5 +++++ 3 files changed, 7 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 9ec416196..35f288b03 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -106,6 +106,7 @@ $lang['fetchsize'] = '外部からのダウンロード最大サイ $lang['notify'] = '変更を通知するメールアドレス'; $lang['registernotify'] = '新規ユーザー登録を通知するメールアドレス'; $lang['mailfrom'] = 'メール送信時の送信元アドレス'; +$lang['mailprefix'] = '自動メールの題名に使用する接頭語'; $lang['gzip_output'] = 'xhtmlに対するコンテンツ圧縮（gzip）を使用'; $lang['gdlib'] = 'GDlibバージョン'; $lang['im_convert'] = 'ImageMagick変換ツールへのパス'; diff --git a/lib/plugins/plugin/lang/ja/lang.php b/lib/plugins/plugin/lang/ja/lang.php index 0deb420c9..56a827b7e 100644 --- a/lib/plugins/plugin/lang/ja/lang.php +++ b/lib/plugins/plugin/lang/ja/lang.php @@ -53,3 +53,4 @@ $lang['enabled'] = 'プラグイン %s が有効です。'; $lang['notenabled'] = 'プラグイン %s を有効にすることができません。権限を確認してください。'; $lang['disabled'] = 'プラグイン %s が無効です。'; $lang['notdisabled'] = 'プラグイン %s を無効にすることができません。権限を確認してください。'; +$lang['packageinstalled'] = 'プラグインパッケージ（%d plugin%s: %s）は正しくインストールされました。'; diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php index 1e0dbdc3f..736924bb1 100644 --- a/lib/plugins/popularity/lang/ja/lang.php +++ b/lib/plugins/popularity/lang/ja/lang.php @@ -9,3 +9,8 @@ */ $lang['name'] = '利用状況調査（ロードに少し時間が掛かります）'; $lang['submit'] = 'データ送信'; +$lang['autosubmit'] = '月に一度は自動的にデータを送付'; +$lang['submissionFailed'] = '次のエラーによりデータが送信できませんでした：'; +$lang['submitDirectly'] = '次のフォームを使ってデータを手動で送信することができます。'; +$lang['autosubmitError'] = '以下のエラーにより最後の自動送信に失敗しました：'; +$lang['lastSent'] = 'データを送信しました。'; -- cgit v1.2.3 From ee379b013d58938f9f5b9372979b40a4d6f58ccf Mon Sep 17 00:00:00 2001 From: Yuji TAKENAKA Date: Sun, 17 Apr 2011 16:38:50 +0200 Subject: Japanese update (missing file) Signed-off-by: Guy Brand --- lib/plugins/popularity/lang/ja/submitted.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lib/plugins/popularity/lang/ja/submitted.txt (limited to 'lib/plugins') diff --git a/lib/plugins/popularity/lang/ja/submitted.txt b/lib/plugins/popularity/lang/ja/submitted.txt new file mode 100644 index 000000000..604f8e55f --- /dev/null +++ b/lib/plugins/popularity/lang/ja/submitted.txt @@ -0,0 +1,3 @@ +====== 利用状況調査 ====== + +データの送信に成功しました。 \ No newline at end of file -- cgit v1.2.3 From 53b4f65b95e301c1dbd4894b6b26d85bba94d289 Mon Sep 17 00:00:00 2001 From: Shuo-Ting Jian Date: Sun, 17 Apr 2011 20:29:39 +0200 Subject: Traditional Chinese update --- lib/plugins/plugin/lang/zh-tw/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php index 77e692fcf..54234212d 100644 --- a/lib/plugins/plugin/lang/zh-tw/lang.php +++ b/lib/plugins/plugin/lang/zh-tw/lang.php @@ -54,3 +54,4 @@ $lang['enabled'] = '插件 %s 已啟用。'; $lang['notenabled'] = '插件 %s 無法啟用，請檢查檔案權限。'; $lang['disabled'] = '插件 %s 已停用。'; $lang['notdisabled'] = '插件 %s 無法停用，請檢查檔案權限。'; +$lang['packageinstalled'] = '插件 (%d 插件%s: %s) 已成功地安裝。'; -- cgit v1.2.3