Added Apatana Studio .project file ignore

Spanish translations (must configure in sources path in the catalog properties in po editor to ../../..
so translations are relative only to the module to which it belongs)
Index.php controls if settings exist (maybe process_settings.php should exists as emoncms3)

.gitignore

@@ -1,3 +1,4 @@
+.project
 settings.php
 Modules/energyaudit
 Modules/node

Modules/feed/Locale/es_ES/LC_MESSAGES/messages.po

@@ -2,64 +2,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 15:31+0100\n"
-"PO-Revision-Date: 2012-10-18 15:38+0100\n"
-"Last-Translator: Trystan <trystan.lea@googlemail.com>\n"
+"POT-Creation-Date: 2012-10-18 17:52+0100\n"
+"PO-Revision-Date: 2012-10-18 17:53+0100\n"
+"Last-Translator: ilde <i.martinez@ismsolar.com>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: es_ES\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: /var/www/emoncms/emoncms/Modules/feed/.\n"
-"X-Poedit-SearchPath-0: /var/www/emoncms/emoncms/Modules/feed/.\n"
+"X-Poedit-Basepath: .\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-SearchPath-0: ../../..\n"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./feed_controller.php:200
+#: ../../../feed_controller.php:200
 msgid "Feed "
 msgstr "Fuente"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./feed_controller.php:200
+#: ../../../feed_controller.php:200
 msgid " deleted"
 msgstr " borrado"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./feed_controller.php:201
+#: ../../../feed_controller.php:201
 msgid "Feed does not exist"
 msgstr "La fuente no existe"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:18
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:21
+#: ../../../Views/feedapi_view.php:19
+msgid "Feed API"
+msgstr "API de Fuentes"
+
+#: ../../../Views/feedapi_view.php:21
+msgid "General"
+msgstr "General"
+
+#: ../../../Views/feedapi_view.php:26
+msgid "Feed properties"
+msgstr "Propiedades de la fuente"
+
+#: ../../../Views/feedapi_view.php:32
+msgid "Feed data"
+msgstr "Datos de la fuente"
+
+#: ../../../Views/feedapi_view.php:37
+msgid "Delete feeds"
+msgstr "Borrar fuentes"
+
+#: ../../../Views/feedlist_view.php:17
+msgid "Feed API Help"
+msgstr "Ayuda de la API para fuentes"
+
+#: ../../../Views/feedlist_view.php:18 ../../../Views/feedlist_view.php:21
 msgid "Deleted feeds"
 msgstr "Fuentes borradas"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:18
+#: ../../../Views/feedlist_view.php:18
 msgid "Feeds"
 msgstr "Fuentes"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:22
+#: ../../../Views/feedlist_view.php:22
 msgid "Delete feeds permanently"
 msgstr "Borrar fuentes de manera permanente?"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:66
+#: ../../../Views/feedlist_view.php:66
 msgid "Name"
 msgstr "Nombre"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:66
+#: ../../../Views/feedlist_view.php:66
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:66
+#: ../../../Views/feedlist_view.php:66
 msgid "Type"
 msgstr "Tipo"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:66
+#: ../../../Views/feedlist_view.php:66
 msgid "Size"
 msgstr "Tamaño"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:66
+#: ../../../Views/feedlist_view.php:66
 msgid "Updated"
 msgstr "Actualizado"
 
-#: /var/www/emoncms/emoncms/Modules/feed/./Views/feedlist_view.php:66
+#: ../../../Views/feedlist_view.php:66
 msgid "Value"
 msgstr "Valor"
-

Modules/feed/Views/feedapi_view.php

@@ -16,25 +16,25 @@
 
 ?>
 
-<h2>Feed API</h2>
+<h2><?php echo _("Feed API");?></h2>
 
-<h3>General</h3>
+<h3><?php echo _("General");?></h3>
 <p><a href="<?php echo $path; ?>feed/create?name=test&type=0"><?php echo $path; ?>feed/create?name=test&type=0</a></p>
 <p><a href="<?php echo $path; ?>feed/getid?name=test"><?php echo $path; ?>feed/getid?name=test</a></p>
 <p><a href="<?php echo $path; ?>feed/list"><?php echo $path; ?>feed/list</a></p>
 
-<h3>Feed properties</h3>
+<h3><?php echo _("Feed properties");?></h3>
 <p><a href="<?php echo $path; ?>feed/value?id=1"><?php echo $path; ?>feed/value?id=1</a></p>
 <p><a href="<?php echo $path; ?>feed/get?id=1"><?php echo $path; ?>feed/get?id=1</a></p>
 <p><a href="<?php echo $path; ?>feed/get?id=1&field=name"><?php echo $path; ?>feed/get?id=1&field=name</a></p>
 <p><a href="<?php echo $path; ?>feed/set?id=1&field=name&value=newname"><?php echo $path; ?>feed/set?id=1&field=name&value=newname</a></p>
 
-<h3>Feed data</h3>
+<h3><?php echo _("Feed data");?></h3>
 <p><a href="<?php echo $path; ?>feed/insert?id=1&value=100"><?php echo $path; ?>feed/insert?id=1&value=100</a></p>
 <p><?php echo $path; ?>feed/update?id=1&time=UNIXTIME&value=100</p>
 <p><a href="<?php echo $path; ?>feed/data?id=1?start=0&end=0&dp=100"><?php echo $path; ?>feed/data?id=1?start=0&end=0&dp=100</a></p>
 
-<h3>Delete feeds</h3>
+<h3><?php echo _("Delete feeds");?></h3>
 <p><a href="<?php echo $path; ?>feed/delete?id=1"><?php echo $path; ?>feed/delete?id=1</a></p>
 <p><a href="<?php echo $path; ?>feed/restore?id=1"><?php echo $path; ?>feed/restore?id=1</a></p>
 <p><a href="<?php echo $path; ?>feed/emptybin"><?php echo $path; ?>feed/emptybin</a></p>

Modules/feed/Views/feedlist_view.php

@@ -14,7 +14,7 @@
 
 <script type="text/javascript" src="<?php print $path; ?>Lib/flot/jquery.min.js"></script>
 
-<div style="float:right;"><a href="api">Feed API Help</a></div>
+<div style="float:right;"><a href="api"><?php echo _("Feed API Help");?></a></div>
 <h2><?php if ($del) echo _('Deleted feeds'); else echo _('Feeds'); ?></h2>
 
 <div id="feedlist"></div>

index.php

@@ -11,6 +11,10 @@
  
   */
 
+  if (!file_exists("settings.php")) {
+    echo "Copy default.settings.php to settings.php and configure";
+    die;
+  }
   require("settings.php");
   require("core.php");
   require("locale.php");