From 7a3cb575f80fa5d08c78bfbcba345b4367fb634a Mon Sep 17 00:00:00 2001 From: Patrick Hausmann Date: Thu, 2 Mar 2017 22:55:03 +0100 Subject: [PATCH] Fixed all issues for 1.5.2 also updated version information. This were many small fixes, so I have done this directly in master. --- .gitignore | 0 Dockerfile | 0 composer.json | 0 composer.lock | 0 docker-compose.yml | 0 lang/post-worktime-logger-de_DE.mo | Bin 3821 -> 4505 bytes lang/post-worktime-logger-de_DE.po | 98 +++++++++++++++++++------ post-worktime-logger.php | 3 +- readme.md | 5 ++ readme.txt | 7 +- resources/css/post-worktime-logger.css | 0 resources/js/Chart.bundle.min.js | 0 resources/js/post-worktime-logger.js | 0 ruleset.xml | 0 screenshots/screenshot-1.png | Bin screenshots/screenshot-2.png | Bin screenshots/screenshot-3.png | Bin screenshots/screenshot-4.png | Bin screenshots/screenshot-5.png | Bin screenshots/screenshot-6.png | Bin screenshots/screenshot-7.png | Bin settings.php | 24 +++++- widget.php | 4 +- 23 files changed, 112 insertions(+), 29 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 composer.json mode change 100644 => 100755 composer.lock mode change 100644 => 100755 docker-compose.yml mode change 100644 => 100755 post-worktime-logger.php mode change 100644 => 100755 readme.md mode change 100644 => 100755 readme.txt mode change 100644 => 100755 resources/css/post-worktime-logger.css mode change 100644 => 100755 resources/js/Chart.bundle.min.js mode change 100644 => 100755 resources/js/post-worktime-logger.js mode change 100644 => 100755 ruleset.xml mode change 100644 => 100755 screenshots/screenshot-1.png mode change 100644 => 100755 screenshots/screenshot-2.png mode change 100644 => 100755 screenshots/screenshot-3.png mode change 100644 => 100755 screenshots/screenshot-4.png mode change 100644 => 100755 screenshots/screenshot-5.png mode change 100644 => 100755 screenshots/screenshot-6.png mode change 100644 => 100755 screenshots/screenshot-7.png mode change 100644 => 100755 widget.php diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 diff --git a/lang/post-worktime-logger-de_DE.mo b/lang/post-worktime-logger-de_DE.mo index af882ad2d1f3c5130407cdf557eea6b667eabbc8..60f25646b4d0ec1b028d26cd9c448de1d379d85f 100755 GIT binary patch delta 1430 zcmZY7Z)hAv7{~Fs_S#FE_S&9WEqHNaOns4LF$qC!)gv)!Lu1=uv?XBFz3k+6$z}JL z-8G~r=_?CT{C5UXU-X4iOJ9g^FBGi4DS--B=-U<)Ux@)hT0zh^exJ)7B0cu@Gc&vU z%*=21_u@xAt3MU8Yl`0>{|EVhmXV%P{agRDkLCdVcW@TV_#2+U=dwz5;wQKVKgYfJ z6&COs9>iPNgy6G53TW^aVPy>u>)`8Zu|#1 z)DDVCe-9S1h&%8w%Jm7n7pL$c=2x%M;815dNx^f-%GA5qoCu}hZM+X); z#P9Jq{(;=8o}t+NIDvVb!vU;f4}OdV=2zd*;7~U>NrX4?3EXJ)dszM*`os7*KFX@r z@fAFaz2slPizpN2cWu6cBFau3l!ZTwhjA9A&Kj=v)3{E<#lMlotC!gB1L&bd_Xf(2 z&fz2YHp+bslvnc&@~HX|WdXNPp4-5C@K1agJGe+w^|gF5PyXEu9A#hx1C+=wv~IYJ zv-H14`N#^yBL%up-fch5;W0dhm#`P_puEBZe2KE~8p_ALjIy8)P!hhh_hpLE_=N%4 zNq*nvMBPXYHGq@&G|KfiQH|-%%#k=&v~V?6DfYE4I0`);fkqBQihtIKJnq^GOKjg9t9Ja2=t z(TQ(#%|_*_S<*q+?8a%W7TJX7Y`WyA@hEf?Q(w&L?MH*ePs{bUvPCVEOfpGHortvO zCa$ASQp++yS_#6q{zZ19XQox@h*VPT-sT;8G)?@-Ha^^TIkRtCPnnhF$a?yC6b4CT z>!sX#nW6fP+=1Q01CI^qp}|8V!-ob(>VM@v9gY*%E}FO*(F;V>uhS)V6of`UPf!w% zK9lOJSIWjNyYs#YoyJLbRl zGEy-MR1+rK=4b>uhEi4Tza zqIhHtyg(Ndi)hDX^x_)~Vi_y(n>GIfYsvSp0UbQ#z%Z(H47`M=(2X-#z~^`deH4e; zUnB|6GjJQ#0&Dyo!;k30uV~;dhA_bK)dpwLk9~L=Q&v8Q`{Xb213sg;gd?2(I&Ps_ zH^HfD*rtoQsskN(63-!fh#Tm^Th{zNJVHK+CvX8(C*N7F zVKocdb$|m@o$>R! zE!c}{y#lJv-S>%V(M#}z0rl~0qIsp_vL;t;59Ol0L9W{a&T)M#olmz)mt)7Qb1rFe z!!_F+abFxT1~YfE6WQ^c(UZ<+I`vp28aE\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,42 +20,42 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Textdomain-Support: yes" -#: post-worktime-logger.php:100 +#: post-worktime-logger.php:101 #@ post-worktime-logger msgid "You have to save the post, before we can track the time." msgstr "Sie müssen den Artikel einmal speichern, bevor die Zeitmessung beginnt." -#: post-worktime-logger.php:139 +#: post-worktime-logger.php:140 #@ post-worktime-logger msgid "Post Worktime" msgstr "Artikel Arbeitszeit" -#: post-worktime-logger.php:117 +#: post-worktime-logger.php:118 #@ post-worktime-logger msgid "Current worktime" msgstr "Aktuelle Arbeitszeit" -#: post-worktime-logger.php:118 +#: post-worktime-logger.php:119 #@ post-worktime-logger msgid "Total worktime" msgstr "Gesamte Arbeitszeit" -#: post-worktime-logger.php:124 +#: post-worktime-logger.php:125 #@ post-worktime-logger msgid "Pause" msgstr "Pausieren" -#: post-worktime-logger.php:125 +#: post-worktime-logger.php:126 #@ post-worktime-logger msgid "Resume" msgstr "Fortfahren" -#: post-worktime-logger.php:126 +#: post-worktime-logger.php:127 #@ post-worktime-logger msgid "Reset" msgstr "Zurücksetzen" -#: post-worktime-logger.php:153 +#: post-worktime-logger.php:154 #@ post-worktime-logger msgid "Worktime" msgstr "Arbeitszeit" @@ -115,7 +115,7 @@ msgstr "Sie verfügen nicht über die notwendigen Berechtigungen um auf diese Se #: settings.php:79 #: settings.php:134 -#: settings.php:260 +#: settings.php:282 #@ post-worktime-logger msgid "Statistics" msgstr "Statistiken" @@ -141,38 +141,38 @@ msgstr "Keine Daten." msgid "Post Worktime Logger Settings" msgstr "Post Worktime Logger Einstellungen" -#: settings.php:198 +#: settings.php:199 #@ default msgid "Save Changes" msgstr "Änderungen speichern" #: settings.php:189 -#: settings.php:202 +#: settings.php:203 #@ post-worktime-logger msgid "Reset whole worktime" msgstr "Gesamte Arbeitszeit zurücksetzen" -#: settings.php:221 +#: settings.php:243 #@ post-worktime-logger msgid "General" msgstr "Allgemein" -#: settings.php:228 +#: settings.php:250 #@ post-worktime-logger msgid "Enable control buttons" msgstr "Aktiviere Steuer-Buttons" -#: settings.php:252 +#: settings.php:274 #@ post-worktime-logger msgid "Inactivity Timeout" msgstr "Zeitunterbrechung durch Inaktivität" -#: settings.php:335 +#: settings.php:357 #@ post-worktime-logger msgid "This will allow you to pause, resume and reset the worktime." msgstr "Erlaubt Ihnen das pausieren, fortfahren und zurücksetzen der Arbeitszeit." -#: settings.php:391 +#: settings.php:413 #@ post-worktime-logger msgid "This option allows you to specify a certain number of minutes that can pass without activity before the timer pauses." msgstr "Erlaubt Ihnen die maximale Zeit der Abwesenheit in Minuten anzugeben, bis der Timer pausiert." @@ -189,22 +189,22 @@ msgstr "Gesamte Arbeitszeit für Artikel: %d Minuten" msgid "Total worktime on posts: %d hours, %d minutes" msgstr "Gesamte Arbeitszeit für Artikel: %d Stunden, %d Minuten" -#: settings.php:244 +#: settings.php:266 #@ post-worktime-logger msgid "Disable Auto Start" msgstr "Deaktiviere Autostart" -#: settings.php:267 +#: settings.php:289 #@ post-worktime-logger msgid "number of posts" msgstr "Anzahl der Artikel" -#: settings.php:353 +#: settings.php:375 #@ post-worktime-logger msgid "Activate this to prevent the time from starting automatically on post editing." msgstr "Aktiviere dies, um das automatische Starten des Timers bei der Bearbeitung von Artikeln zu verhindern. " -#: settings.php:409 +#: settings.php:431 #@ post-worktime-logger msgid "Specify this amount of posts to be displayed on the statistics page top worktime chart" msgstr "Definiere die Anzahl der Artikel, die auf der Statistik-Seite dargestellt werden sollen. " @@ -219,13 +219,63 @@ msgstr "Deaktiviere das Aufzeichnen der Arbeitszeit im Frontend" msgid "This will only affect logged in users." msgstr "Dies betrifft nur eingeloggte Nutzer." -#: settings.php:236 +#: settings.php:258 #@ post-worktime-logger msgid "Disable auto start for published posts" msgstr "Deaktiviere Autostart für bereits veröffentlichte Artikel" -#: settings.php:372 +#: settings.php:394 #@ post-worktime-logger msgid "Activate this to prevent the time from starting automatically on post editing for published posts." msgstr "Aktiviere dies, um das automatische Starten des Timers bei der Bearbeitung von bereits veröffentlichten Artikeln zu verhindern." +#: settings.php:193 +#@ post-worktime-logger +msgid "Current version" +msgstr "Aktuelle Version" + +#: settings.php:207 +#@ post-worktime-logger +msgid "Need Help?" +msgstr "Brauchst du Hilfe?" + +#: settings.php:209 +#@ post-worktime-logger +msgid "Do you need help or has found a bug? Please describe the problem in the support forum." +msgstr "Brauchst du Hilfe oder hast einen Fehler gefunden? Bitte beschreibe das Problem im Support Forum." + +#: settings.php:211 +#@ post-worktime-logger +msgid "Support Forum" +msgstr "Support Forum" + +#: settings.php:212 +#@ post-worktime-logger +msgid "Github" +msgstr "Github" + +#: settings.php:216 +#@ post-worktime-logger +msgid "Other Plugins" +msgstr "Andere Plugins" + +#: settings.php:217 +#@ post-worktime-logger +msgid "WP Keyword Monitor" +msgstr "WP Keyword Monitor" + +#: settings.php:219 +#@ post-worktime-logger +msgid "A powerful SEO tool to track your rankings." +msgstr "Ein starkes SEO Tool, um deine Rackings zu überwachen." + +#: settings.php:224 +#@ post-worktime-logger +msgid "Support Plugin Author" +msgstr "Unterstütze den Plugin Autor" + +#: settings.php:225 +#@ post-worktime-logger +msgid "Donate" +msgstr "Spenden" + diff --git a/post-worktime-logger.php b/post-worktime-logger.php old mode 100644 new mode 100755 index 69a4100..c14efa2 --- a/post-worktime-logger.php +++ b/post-worktime-logger.php @@ -9,12 +9,13 @@ Plugin Name: Post Worktime Logger Plugin URI: https://wordpress.org/plugins/post-worktime-logger/ Description: A plugin to track the worktime for each post. -Version: 1.5.1 +Version: 1.5.2 Author: Patrick Hausmann Author URI: https://profiles.wordpress.org/filme-blog/ License: GPLv3 Text Domain: post-worktime-logger */ +const PWL_VERSION = "1.5.2"; if ( !defined('PLUGINDIR') ) define( 'PLUGINDIR', 'wp-content/plugins' ); diff --git a/readme.md b/readme.md old mode 100644 new mode 100755 index 5a64ee2..a64bc90 --- a/readme.md +++ b/readme.md @@ -86,6 +86,11 @@ You can donate to this project via ## Changelog +### 1.5.2 +* Improved settings page. +* Implemented support to show current version number in settings page. +* Fixed some warning messages. + ### 1.5.1 * Fixed check to disable the widget on the static front page. * Fixed typo. diff --git a/readme.txt b/readme.txt old mode 100644 new mode 100755 index 7f8c1c3..62208ee --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i Tags: worktime, work, clock, time, time-tracking, tracking, Zeiterfassung, worktime logger, post work time, working time, Stunden, Uhr, Timer Requires at least: 2.3.1 Tested up to: 4.6 -Stable tag: 1.5.1 +Stable tag: 1.5.2 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl.html @@ -46,6 +46,11 @@ You can donate to this project via PayPal by visiting this page: https://www.pay == Changelog == += 1.5.2 = +* Improved settings page. +* Implemented support to show current version number in settings page. +* Fixed some warning messages. + = 1.5.1 = * Fixed check to disable the widget on the static front page. * Fixed typo. diff --git a/resources/css/post-worktime-logger.css b/resources/css/post-worktime-logger.css old mode 100644 new mode 100755 diff --git a/resources/js/Chart.bundle.min.js b/resources/js/Chart.bundle.min.js old mode 100644 new mode 100755 diff --git a/resources/js/post-worktime-logger.js b/resources/js/post-worktime-logger.js old mode 100644 new mode 100755 diff --git a/ruleset.xml b/ruleset.xml old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-1.png b/screenshots/screenshot-1.png old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-2.png b/screenshots/screenshot-2.png old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-3.png b/screenshots/screenshot-3.png old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-4.png b/screenshots/screenshot-4.png old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-5.png b/screenshots/screenshot-5.png old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-6.png b/screenshots/screenshot-6.png old mode 100644 new mode 100755 diff --git a/screenshots/screenshot-7.png b/screenshots/screenshot-7.png old mode 100644 new mode 100755 diff --git a/settings.php b/settings.php index 21a3769..bc5e614 100755 --- a/settings.php +++ b/settings.php @@ -188,8 +188,9 @@ public function createAdminSettingsPage() { $confirmMessage = __("Reset whole worktime", self::PWL_TEXT_DOMAIN).'?'; ?> -
+

+

+
+

+

+ +

+ + +
+ +
+

+ +

+ +

+
+ +
+

+ +