From 35e66f8ffc6b0264855c6162270309c094961b59 Mon Sep 17 00:00:00 2001 From: tleegaard Date: Wed, 25 Sep 2013 22:22:36 +0200 Subject: [PATCH] Added locale/gettext stuff to the event module. --- event_controller.php | 10 +- event_list.php | 128 ++++----- event_menu.php | 2 +- event_model.php | 12 +- event_settings_view.php | 6 +- locale/en_EN/LC_MESSAGES/messages.mo | Bin 0 -> 498 bytes locale/en_EN/LC_MESSAGES/messages.po | 371 +++++++++++++++++++++++++++ 7 files changed, 450 insertions(+), 79 deletions(-) create mode 100644 locale/en_EN/LC_MESSAGES/messages.mo create mode 100644 locale/en_EN/LC_MESSAGES/messages.po diff --git a/event_controller.php b/event_controller.php index 3b7e14c..52f032e 100644 --- a/event_controller.php +++ b/event_controller.php @@ -39,7 +39,7 @@ function event_controller() $message = get('message'); $event->add($userid,$eventfeed,$eventtype,$eventvalue,$action,$setfeed,$setemail,$setvalue,$callcurl,$message,$mutetime,$priority); - $result = "Event added"; + $result = _("Event added"); } if ($route->action == 'edit' && $session['write']) { @@ -57,7 +57,7 @@ function event_controller() $message = get('message'); $event->update($userid,$eventid,$eventfeed,$eventtype,$eventvalue,$action,$setfeed,$setemail,$setvalue,$callcurl,$message,$mutetime,$priority); - $result = "Event updated"; + $result = _("Event updated"); } @@ -65,14 +65,14 @@ function event_controller() { $id = intval(get('id')); $event->delete($userid,$id); - $result = "Event deleted"; + $result = _("Event deleted"); } else if ($route->action == 'status' && $session['write']) { $id = intval(get('id')); $status = intval(get('status')); $event->set_status($userid,$id,$status); - $result = "Event deleted"; + $result = _("Event deleted"); } else if ($route->action == 'test' && $session['write']) @@ -80,7 +80,7 @@ function event_controller() $id = intval(get('id')); $feedid = intval(get('feedid')); $event->test($userid,$id,$feedid); - $result = "Event Test Sent"; + $result = _("Event Test Sent"); } else if ($route->action == 'settings' && $session['write']) diff --git a/event_list.php b/event_list.php index 17f19ec..d8d32dd 100644 --- a/event_list.php +++ b/event_list.php @@ -17,18 +17,18 @@ -
Event Settings
-

Event

+
+

-

Setup actions to occur when a feed goes above, below or is equal to a specified value, or becomes inactive. Send an email or set another feed to a specified value.

+

-

No event notifications created

-

To add an event based notification:

-

1) Select the feed you wish to be notified about from the drop down menu

-

2) Select whether you want to be notifed if the feed goes above, below or equals the value specified, or is inactive.

-

3) Enter a value

+

+

+

+

+

@@ -43,11 +43,11 @@ if ($item['eventtype']==0) echo ">"; if ($item['eventtype']==1) echo "<"; if ($item['eventtype']==2) echo "=="; - if ($item['eventtype']==3) echo "inactive"; - if ($item['eventtype']==4) echo "updated"; - if ($item['eventtype']==5) echo "inc by"; - if ($item['eventtype']==6) echo "dec by"; - if ($item['eventtype']==7) echo "manual update"; + if ($item['eventtype']==3) echo _("inactive"); + if ($item['eventtype']==4) echo _("updated"); + if ($item['eventtype']==5) echo _("inc by"); + if ($item['eventtype']==6) echo _("dec by"); + if ($item['eventtype']==7) echo _("manual update"); ?> @@ -88,7 +88,7 @@ - + + > - + - + - + - +
@@ -74,12 +74,12 @@ get_field($item['setfeed'],'name'); ?> secs
Edit
Delete
Disable
Enable
Test
@@ -125,7 +125,7 @@
-
IF
+
- is + @@ -152,12 +152,12 @@ : - to + - message + - priority + @@ -196,23 +196,23 @@ -
Add
-
Edit
+
+
diff --git a/event_menu.php b/event_menu.php index 756b4ce..31144f9 100644 --- a/event_menu.php +++ b/event_menu.php @@ -1,3 +1,3 @@ "Event", 'path'=>"event" , 'session'=>"write", 'order' => 10 ); + $menu_dropdown[] = array('name'=> _("Event"), 'path'=>"event" , 'session'=>"write", 'order' => 10 ); diff --git a/event_model.php b/event_model.php index 466ae58..89d21fa 100644 --- a/event_model.php +++ b/event_model.php @@ -232,10 +232,10 @@ public function check_feed_event($feedid,$updatetime,$feedtime,$value,$row=NULL, $message = str_replace('{feed}', $feedData->name, $message); $message = str_replace('{value}', $value, $message); $message = htmlspecialchars($message); - if (empty($message)) { $message = "No message body"; } + if (empty($message)) { $message = _("No message body"); } if($test){ - $message = 'TEST - '.$message; + $message = _('TEST - ').$message; } // event type @@ -313,11 +313,11 @@ public function check_feed_event($feedid,$updatetime,$feedtime,$value,$row=NULL, // grab URL and pass it to the browser if(curl_exec($ch) === false){ - error_log("Curl Error:".curl_error($ch)); + error_log(_("Curl Error:").curl_error($ch)); } // close cURL resource, and free up system resources curl_close($ch); - error_log("Curl Log:".$body); + error_log(_("Curl Log:").$body); break; @@ -345,7 +345,7 @@ public function check_feed_event($feedid,$updatetime,$feedtime,$value,$row=NULL, $writeconnection->url('1/statuses/update'), array('status' => $message)); if ($writeconnection->response['code'] != 200) { - error_log("Twitter error:".$writeconnection->pr(htmlentities($writeconnection->response['response']))); + error_log(_("Twitter error:").$writeconnection->pr(htmlentities($writeconnection->response['response']))); } break; case 4: @@ -367,7 +367,7 @@ public function check_feed_event($feedid,$updatetime,$feedtime,$value,$row=NULL, // These are optional: - $message = 'event at '.date("Y-m-d H:i:s",time()); + $message = _('event at ').date("Y-m-d H:i:s",time()); $oMsg->setDescription($message); $oMsg->setApplication('emoncms'); diff --git a/event_settings_view.php b/event_settings_view.php index 04e1fe1..fc7fb2e 100644 --- a/event_settings_view.php +++ b/event_settings_view.php @@ -1,7 +1,7 @@ -

Event settings

+

@@ -27,8 +27,8 @@

diff --git a/locale/en_EN/LC_MESSAGES/messages.mo b/locale/en_EN/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..2a6b49774f7d2e93f9b36bbd196ffd26348f617f GIT binary patch literal 498 zcmaJ+!A`@toSb+s8EJnV36nT#@HJB-a8(hB{o4K)a6pMK`N2*;neXfnEw(OpCSV>yM!spK+YP3Ijf80dq XxBSyB{SKu~7gH8Mz!JateZ0mOY!Z@* literal 0 HcmV?d00001 diff --git a/locale/en_EN/LC_MESSAGES/messages.po b/locale/en_EN/LC_MESSAGES/messages.po new file mode 100644 index 0000000..1657955 --- /dev/null +++ b/locale/en_EN/LC_MESSAGES/messages.po @@ -0,0 +1,371 @@ +msgid "" +msgstr "" +"Project-Id-Version: emoncmsevents\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-25 22:21+0100\n" +"PO-Revision-Date: 2013-09-25 22:21+0100\n" +"Last-Translator: Troels Leegaard \n" +"Language-Team: \n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Poedit-Basepath: .\n" +"X-Generator: Poedit 1.5.4\n" +"X-Poedit-SearchPath-0: ../../..\n" + +#: ../../../event_menu.php:3 +#: ../../../event_list.php:21 +msgid "Event" +msgstr "" + +#: ../../../event_controller.php:42 +msgid "Event added" +msgstr "" + +#: ../../../event_controller.php:60 +msgid "Event updated" +msgstr "" + +#: ../../../event_controller.php:68 +#: ../../../event_controller.php:75 +msgid "Event deleted" +msgstr "" + +#: ../../../event_controller.php:83 +msgid "Event Test Sent" +msgstr "" + +#: ../../../event_model.php:235 +msgid "No message body" +msgstr "" + +#: ../../../event_model.php:238 +msgid "TEST - " +msgstr "" + +#: ../../../event_model.php:316 +msgid "Curl Error:" +msgstr "" + +#: ../../../event_model.php:320 +msgid "Curl Log:" +msgstr "" + +#: ../../../event_model.php:348 +msgid "Twitter error:" +msgstr "" + +#: ../../../event_model.php:370 +msgid "event at " +msgstr "" + +#: ../../../event_list.php:20 +msgid "Event Settings" +msgstr "" + +#: ../../../event_list.php:23 +msgid "Setup actions to occur when a feed goes above, below or is equal to a specified value, or becomes inactive. Send an email or set another feed to a specified value." +msgstr "" + +#: ../../../event_list.php:27 +msgid "No event notifications created" +msgstr "" + +#: ../../../event_list.php:28 +msgid "To add an event based notification:" +msgstr "" + +#: ../../../event_list.php:29 +msgid "1) Select the feed you wish to be notified about from the drop down menu" +msgstr "" + +#: ../../../event_list.php:30 +msgid "2) Select whether you want to be notifed if the feed goes above, below or equals the value specified, or is inactive." +msgstr "" + +#: ../../../event_list.php:31 +msgid "3) Enter a value" +msgstr "" + +#: ../../../event_list.php:46 +#: ../../../event_list.php:143 +msgid "inactive" +msgstr "" + +#: ../../../event_list.php:47 +msgid "updated" +msgstr "" + +#: ../../../event_list.php:48 +msgid "inc by" +msgstr "" + +#: ../../../event_list.php:49 +msgid "dec by" +msgstr "" + +#: ../../../event_list.php:50 +#: ../../../event_list.php:145 +msgid "manual update" +msgstr "" + +#: ../../../event_list.php:77 +msgid "email" +msgstr "" + +#: ../../../event_list.php:78 +msgid "feed" +msgstr "" + +#: ../../../event_list.php:79 +msgid "curl" +msgstr "" + +#: ../../../event_list.php:80 +#: ../../../event_list.php:158 +msgid "tweet" +msgstr "" + +#: ../../../event_list.php:81 +msgid "prowl" +msgstr "" + +#: ../../../event_list.php:82 +msgid "nma" +msgstr "" + +#: ../../../event_list.php:91 +msgid "secs" +msgstr "" + +#: ../../../event_list.php:105 +#: ../../../event_list.php:215 +msgid "Edit" +msgstr "" + +#: ../../../event_list.php:107 +msgid "Delete" +msgstr "" + +#: ../../../event_list.php:110 +msgid "Disable" +msgstr "" + +#: ../../../event_list.php:113 +msgid "Enable" +msgstr "" + +#: ../../../event_list.php:117 +msgid "Test" +msgstr "" + +#: ../../../event_list.php:128 +msgid "IF" +msgstr "" + +#: ../../../event_list.php:136 +msgid "is" +msgstr "" + +#: ../../../event_list.php:138 +msgid "more than" +msgstr "" + +#: ../../../event_list.php:139 +msgid "increases by" +msgstr "" + +#: ../../../event_list.php:140 +msgid "less than" +msgstr "" + +#: ../../../event_list.php:141 +msgid "reduces by" +msgstr "" + +#: ../../../event_list.php:142 +msgid "equal to" +msgstr "" + +#: ../../../event_list.php:144 +msgid "is updated" +msgstr "" + +#: ../../../event_list.php:155 +msgid "send email" +msgstr "" + +#: ../../../event_list.php:156 +msgid "set feed" +msgstr "" + +#: ../../../event_list.php:157 +msgid "call url" +msgstr "" + +#: ../../../event_list.php:159 +msgid "send prowl" +msgstr "" + +#: ../../../event_list.php:160 +msgid "send nma" +msgstr "" + +#: ../../../event_list.php:175 +msgid "to" +msgstr "" + +#: ../../../event_list.php:179 +msgid "message" +msgstr "" + +#: ../../../event_list.php:183 +msgid "priority" +msgstr "" + +#: ../../../event_list.php:185 +msgid "Very Low" +msgstr "" + +#: ../../../event_list.php:186 +msgid "Moderate" +msgstr "" + +#: ../../../event_list.php:187 +msgid "Normal" +msgstr "" + +#: ../../../event_list.php:188 +msgid "High" +msgstr "" + +#: ../../../event_list.php:189 +msgid "Emergency" +msgstr "" + +#: ../../../event_list.php:199 +msgid "No mute" +msgstr "" + +#: ../../../event_list.php:200 +msgid "5 secs" +msgstr "" + +#: ../../../event_list.php:201 +msgid "15 secs" +msgstr "" + +#: ../../../event_list.php:202 +msgid "30 secs" +msgstr "" + +#: ../../../event_list.php:203 +msgid "1 min" +msgstr "" + +#: ../../../event_list.php:204 +msgid "5 min" +msgstr "" + +#: ../../../event_list.php:205 +msgid "10 min" +msgstr "" + +#: ../../../event_list.php:206 +msgid "30 min" +msgstr "" + +#: ../../../event_list.php:207 +msgid "1 hour" +msgstr "" + +#: ../../../event_list.php:208 +msgid "3 hour" +msgstr "" + +#: ../../../event_list.php:209 +msgid "6 hour" +msgstr "" + +#: ../../../event_list.php:210 +msgid "12 hour" +msgstr "" + +#: ../../../event_list.php:211 +msgid "24 hour" +msgstr "" + +#: ../../../event_list.php:214 +msgid "Add" +msgstr "" + +#: ../../../event_settings_view.php:4 +msgid "Event settings" +msgstr "" + +#: ../../../event_settings_view.php:11 +msgid "Email settings" +msgstr "" + +#: ../../../event_settings_view.php:13 +msgid "SMTP server" +msgstr "" + +#: ../../../event_settings_view.php:17 +msgid "SMTP user" +msgstr "" + +#: ../../../event_settings_view.php:21 +msgid "SMTP password" +msgstr "" + +#: ../../../event_settings_view.php:30 +msgid "25 (No SSL)" +msgstr "" + +#: ../../../event_settings_view.php:31 +msgid "465 (SSL)" +msgstr "" + +#: ../../../event_settings_view.php:39 +msgid "Twitter settings" +msgstr "" + +#: ../../../event_settings_view.php:40 +msgid "Consumer key:" +msgstr "" + +#: ../../../event_settings_view.php:42 +msgid "Consumer secret:" +msgstr "" + +#: ../../../event_settings_view.php:44 +msgid "Access token:" +msgstr "" + +#: ../../../event_settings_view.php:46 +msgid "Access Token secret:" +msgstr "" + +#: ../../../event_settings_view.php:53 +msgid "Prowl settings" +msgstr "" + +#: ../../../event_settings_view.php:54 +msgid "Prowl key:" +msgstr "" + +#: ../../../event_settings_view.php:61 +msgid "NMA settings" +msgstr "" + +#: ../../../event_settings_view.php:62 +msgid "NMA key:" +msgstr "" + +#: ../../../event_settings_view.php:70 +msgid "Change" +msgstr "" +