Changeset 212

Timestamp:

06/20/08 13:34:31 (15 years ago)

Author:

olivier

Message:

Piwik plugin update

Location:

plugins/piwik

Files:

• index.php (modified) (3 diffs)
• locales/_pot/main.pot (modified) (2 diffs)
• locales/fr/main.po (modified) (2 diffs)

plugins/piwik/index.php

@@ -127 +127 @@
 echo
 '<form action="'.$p_url.'" method="post">'.
+'<fieldset><legend>'.__('Your Piwik configuration').'</legend>'.
 '<p class="field"><label>'.__('Your Piwik URL:').' '.
 form::field('piwik_uri',40,255,html::escapeHTML($piwik_uri)).'</label></p>'.
@@ -141 +142 @@
      '<p class="field"><label>'.__('Piwik website to track:').' '.
      form::combo('piwik_site',$sites_combo,$piwik_site).'</label></p>'.
+     '<p class="field"><label>'.__('Use fancy page names:').' '.
+     form::checkbox('piwik_fancy',1,$piwik_fancy).'</label></p>'.
      '<p class="field"><label for="piwik_ips">'.__('Do not track following IP addresses:').'</label> '.
      form::field('piwik_ips',50,600,$piwik_ips).'</p>'.
-     '<p class="field"><label>'.__('Use fancy page names:').' '.
-     form::checkbox('piwik_fancy',1,$piwik_fancy).'</label></p>';
+     '<p>'.sprintf(__('Your current IP address is: %s'),'<strong>'.http::realIP().'</strong>').'</p>';
 }
 
 echo
 '<p><input type="submit" value="'.__('save').'" />'.
-$core->formNonce().'</p>'.
-'</form>';
+$core->formNonce().'</p>';
 
-if ($piwik_site && $piwik_uri)
-{
-     echo '<h3><a href="'.$piwik_uri.'">'.sprintf(__('View "%s" statistics'),html::escapeHTML($piwik_sites[$piwik_site]['name'])).'</a></h3>';
+if ($piwik_site && $piwik_uri) {
+     echo '<p><strong><a href="'.$piwik_uri.'">'.
+     sprintf(__('View "%s" statistics'),html::escapeHTML($piwik_sites[$piwik_site]['name'])).'</a></strong></p>';
 }
+
+echo '</fieldset></form>';
 
 if ($piwik_uri)
 {
      echo
-     '<h3>'.__('Create a new Piwik site for this blog').'</h3>'.
      '<form action="'.$p_url.'" method="post">'.
+     '<fieldset><legend>'.__('Create a new Piwik site for this blog').'</legend>'.
      '<p class="field"><label>'.__('Site name:').' '.
      form::field('site_name',40,255,$site_name).'</label></p>'.
@@ -168 +171 @@
      '<p><input type="submit" value="'.__('create site').'" />'.
      $core->formNonce().'</p>'.
-     '</form>';
+     '</fieldset></form>';
 }
 

plugins/piwik/locales/_pot/main.pot

@@ -8 +8 @@
 "Project-Id-Version: Dotclear 2 piwik module\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-19 18:28+0200\n"
+"POT-Creation-Date: 2008-06-20 13:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -49 +49 @@
 msgstr ""
 
-#: plugins-test/piwik//index.php:125
+#: plugins-test/piwik//index.php:125 plugins-test/piwik//index.php:129
 msgid "Your Piwik configuration"
 msgstr ""
 
-#: plugins-test/piwik//index.php:129
+#: plugins-test/piwik//index.php:130
 msgid "Your Piwik URL:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:131
+#: plugins-test/piwik//index.php:132
 msgid "Your Piwik Token:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:136
+#: plugins-test/piwik//index.php:137
 msgid "Your Piwik installation is not configured yet."
 msgstr ""
 
-#: plugins-test/piwik//index.php:141
+#: plugins-test/piwik//index.php:142
 msgid "Piwik website to track:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:143
+#: plugins-test/piwik//index.php:144
+msgid "Use fancy page names:"
+msgstr ""
+
+#: plugins-test/piwik//index.php:146
 msgid "Do not track following IP addresses:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:145
-msgid "Use fancy page names:"
+#: plugins-test/piwik//index.php:148
+#, php-format
+msgid "Your current IP address is: %s"
 msgstr ""
 
-#: plugins-test/piwik//index.php:156
+#: plugins-test/piwik//index.php:157
 #, php-format
 msgid "View \"%s\" statistics"
 msgstr ""
 
-#: plugins-test/piwik//index.php:162
+#: plugins-test/piwik//index.php:166
 msgid "Create a new Piwik site for this blog"
 msgstr ""
 
-#: plugins-test/piwik//index.php:164
+#: plugins-test/piwik//index.php:167
 msgid "Site name:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:166
+#: plugins-test/piwik//index.php:169
 msgid "Site URL:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:168
+#: plugins-test/piwik//index.php:171
 msgid "create site"
 msgstr ""

plugins/piwik/locales/fr/main.po

@@ -7 +7 @@
 "Project-Id-Version: Dotclear 2 piwik module\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-19 18:28+0200\n"
-"PO-Revision-Date: 2008-06-19 18:28+0100\n"
+"POT-Creation-Date: 2008-06-20 13:30+0200\n"
+"PO-Revision-Date: 2008-06-20 13:31+0100\n"
 "Last-Translator: Olivier Meunier <olivier@dotclear.net>\n"
 "Language-Team: \n"
@@ -56 +56 @@
 msgstr "Site Piwik à suivre :"
 
+msgid "Use fancy page names:"
+msgstr "Utiliser des noms de page améliorés :"
+
 msgid "Do not track following IP addresses:"
 msgstr "Ne pas activer le suivi sur les adresses IP suivantes :"
 
-msgid "Use fancy page names:"
-msgstr "Utiliser des noms de page améliorés :"
+#, php-format
+msgid "Your current IP address is: %s"
+msgstr "Votre adresse IP est actuellement : %s"
 
 #, php-format