From 9fb9909916c8ce7fbca17d536942c0166afe487c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 17 May 2015 17:58:50 +0200 Subject: added more localization --- lib/plugins/styler/admin.php | 8 +++++++- lib/plugins/styler/lang/en/intro.txt | 4 ++-- lib/plugins/styler/lang/en/lang.php | 11 +++++++++++ lib/tpl/dokuwiki/lang/en/lang.php | 12 ++++++++++++ lib/tpl/dokuwiki/lang/en/style.txt | 4 ++++ lib/tpl/dokuwiki/pagefooter.html | 4 ++++ 6 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 lib/tpl/dokuwiki/lang/en/lang.php create mode 100644 lib/tpl/dokuwiki/lang/en/style.txt create mode 100644 lib/tpl/dokuwiki/pagefooter.html diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php index 8d44ac6f5..4269a0ee7 100644 --- a/lib/plugins/styler/admin.php +++ b/lib/plugins/styler/admin.php @@ -82,8 +82,12 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin { echo ''; foreach($replacements as $key => $value) { + $name = tpl_getLang($key); + if(empty($name)) $name = $this->getLang($key); + if(empty($name)) $name = $key; + echo ''; - echo ''; + echo ''; echo ''; } @@ -104,6 +108,8 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin { echo ''; + echo tpl_locale_xhtml('style'); + } } diff --git a/lib/plugins/styler/lang/en/intro.txt b/lib/plugins/styler/lang/en/intro.txt index bb9e3ff33..4ea55172f 100644 --- a/lib/plugins/styler/lang/en/intro.txt +++ b/lib/plugins/styler/lang/en/intro.txt @@ -1,2 +1,2 @@ -This tool allows you to change certain style settings of your currently selected template -all changes are stored in a local configuration file and are upgrade safe. \ No newline at end of file +This tool allows you to change certain style settings of your currently selected template. +All changes are stored in a local configuration file and are upgrade safe. \ No newline at end of file diff --git a/lib/plugins/styler/lang/en/lang.php b/lib/plugins/styler/lang/en/lang.php index 2dd7921b0..1bf8efa2c 100644 --- a/lib/plugins/styler/lang/en/lang.php +++ b/lib/plugins/styler/lang/en/lang.php @@ -16,6 +16,17 @@ $lang['btn_save'] = 'Save your changes'; $lang['btn_reset'] = 'Reset your current changes'; $lang['btn_revert'] = 'Revert all styles back to the template\'s default'; +// default guaranteed placeholders +$lang['__text__'] = 'Main text color'; +$lang['__background__'] = 'Main text background color'; +$lang['__text_alt__'] = 'Alternative text color'; +$lang['__background_alt__'] = 'Alternative text background color'; +$lang['__text_neu__'] = 'Neutral text color'; +$lang['__background_neu__'] = 'Neutral text background color'; +$lang['__border__'] = 'Border color'; +$lang['__highlight__'] = 'Highlight color (for search results mainly)'; + + //Setup VIM: ex: et ts=4 : diff --git a/lib/tpl/dokuwiki/lang/en/lang.php b/lib/tpl/dokuwiki/lang/en/lang.php new file mode 100644 index 000000000..82a720e21 --- /dev/null +++ b/lib/tpl/dokuwiki/lang/en/lang.php @@ -0,0 +1,12 @@ +tpl(); -- cgit v1.2.3
'.$key.''.$name.'colorClass($key).' />'; echo '