added more localization

6 files changed, 40 insertions, 3 deletions

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 '<table>';
             foreach($replacements as $key => $value) {
+                $name = tpl_getLang($key);
+                if(empty($name)) $name = $this->getLang($key);
+                if(empty($name)) $name = $key;
+
                 echo '<tr>';
-                echo '<td>'.$key.'</td>';
+                echo '<td>'.$name.'</td>';
                 echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
                 echo '</tr>';
             }
@@ -104,6 +108,8 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
 
             echo '</form>';
 
+            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 @@
+<?php
+
+// style.ini values
+
+$lang['__background_site__'] = 'Color for the very background (behind the content box)';
+$lang['__link__']     = 'The general link color';
+$lang['__existing__'] = 'The color for links to existing pages';
+$lang['__missing__']  = 'The color for links to non-existing pages';
+$lang['__site_width__']    = 'The width of the full site (can also be a percentage)';
+$lang['__sidebar_width__'] = 'The width of the sitebar if any (can also be a percentage)';
+$lang['__tablet_width__']  = 'Below screensizes of this width, the site switches to tablet mode';
+$lang['__phone_width__']   = 'Below screensizes of this width, the site switches to phone mode';
diff --git a/lib/tpl/dokuwiki/lang/en/style.txt b/lib/tpl/dokuwiki/lang/en/style.txt
new file mode 100644
index 000000000..f6bb4fc6f
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/en/style.txt
@@ -0,0 +1,4 @@
+If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' in the ''wiki'' namespace and it
+will be automaticaly be used. You can also upload a ''favicon.ico'' there. If you use a closed
+wiki it is recommended to make the ''wiki'' namespace world readable in the ACL settings or
+your logo is not shown to not logged in users.
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/pagefooter.html b/lib/tpl/dokuwiki/pagefooter.html
new file mode 100644
index 000000000..a361c4d69
--- /dev/null
+++ b/lib/tpl/dokuwiki/pagefooter.html
@@ -0,0 +1,4 @@
+<?php
+
+$plg = plugin_load('action', 'feedback');
+if($plg) $plg->tpl();