Merge branch 'release/2.0.3'

scholarslab · Jun 16, 2014 · 5eb7b64 · 5eb7b64
2 parents 7a9c7c1 + 3935228
commit 5eb7b64
Show file tree

Hide file tree

Showing 30 changed files with 150 additions and 190 deletions.
diff --git a/Gemfile b/Gemfile
@@ -28,8 +28,3 @@ group :development do
   gem 'rb-fsevent'
 end
 
-group :vagrant do
-  gem 'vagrant', '~> 1.0.3'
-  gem 'zayin'
-end
-
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,7 +4,6 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    archive-tar-minitar (0.5.2)
     builder (3.2.0)
     capybara (2.0.3)
       mime-types (>= 1.16)
@@ -45,7 +44,6 @@ GEM
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
-    erubis (2.7.0)
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -103,7 +101,6 @@ GEM
       em-dir-watcher (>= 0.1)
       em-websocket (>= 0.3.5)
       json (>= 1.5.3)
-    log4r (1.1.10)
     lumberjack (1.0.3)
     mechanize (2.6.0)
       domain_name (~> 0.5, >= 0.5.1)
@@ -119,9 +116,6 @@ GEM
     multi_xml (0.5.3)
     net-http-digest_auth (1.3)
     net-http-persistent (2.8)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
     nokogiri (1.5.9)
     ntlm-http (0.1.1)
     peach (0.5.1)
@@ -150,21 +144,10 @@ GEM
     unf (0.1.1)
       unf_ext
     unf_ext (0.0.6)
-    vagrant (1.0.7)
-      archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (>= 1.5.1, < 1.8.0)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
     webrobots (0.1.1)
     websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)
-    zayin (0.2.0)
-      rake (~> 0.8)
 
 PLATFORMS
   ruby
@@ -192,5 +175,3 @@ DEPENDENCIES
   rspec-expectations
   sass
   selenium-webdriver
-  vagrant (~> 1.0.3)
-  zayin
diff --git a/NeatlineFeaturesPlugin.php b/NeatlineFeaturesPlugin.php
@@ -187,7 +187,7 @@ public function hookAdminHead($args)
 
             // We are also outputting the script tags to load OpenLayers here.
             $this->_queueJsUri(
-                "http://maps.google.com/maps/api/js?v=3.8&sensor=false"
+                "//maps.google.com/maps/api/js?v=3.8&sensor=false"
             );
             queue_js_file('libraries/openlayers/OpenLayers.min');
             queue_js_file('libraries/tile.stamen');
@@ -223,7 +223,7 @@ public function hookPublicHead()
 
             // We are also outputting the script tags to load OpenLayers here.
             $this->_queueJsUri(
-                "http://maps.google.com/maps/api/js?v=3.8&sensor=false"
+                "//maps.google.com/maps/api/js?v=3.8&sensor=false"
             );
             queue_js_file('libraries/openlayers/OpenLayers.min');
             queue_js_file('libraries/tile.stamen');

diff --git a/Rakefile b/Rakefile
@@ -146,7 +146,7 @@ task :update_pot do
   pot_duplicates = Tempfile.new("-duplicates.pot")
   pot_duplicates.close
 
-  files.pmap do |filename|
+  files.each do |filename|
     sh %{xgettext -L php --from-code=utf-8 -k__ --flag=__:1:pass-php-format --omit-header -F -o #{pot_temp.path} #{filename}}
   end
 

diff --git a/features/data/db-dump.sql.gz b/features/data/db-dump.sql.gz
diff --git a/languages/de_DE.mo b/languages/de_DE.mo
diff --git a/languages/de_DE.po b/languages/de_DE.po
@@ -1,20 +1,20 @@
 # Translation for the Neatline Time plugin for Omeka.
 # 
 # Translators:
-#   <martin.liebeskind@live.de>, 2012.
+# Martin Liebeskind <martin.liebeskind@live.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
-"PO-Revision-Date: 2012-08-24 19:46+0000\n"
+"PO-Revision-Date: 2013-11-20 13:30+0000\n"
 "Last-Translator: Martin Liebeskind <martin.liebeskind@live.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/neatline/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: views/shared/coverage.php:28
 msgid "Use Map"

diff --git a/languages/en_US.mo b/languages/en_US.mo
diff --git a/languages/en_US.po b/languages/en_US.po
@@ -4,11 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
-"PO-Revision-Date: 2012-06-25 15:51+0000\n"
+"PO-Revision-Date: 2013-11-20 13:30+0000\n"
 "Last-Translator: Jeremy Boggs <jeremy@clioweb.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: English (United States) (http://www.transifex.com/projects/p/neatline/language/en_US/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/languages/es.mo b/languages/es.mo
diff --git a/languages/es.po b/languages/es.po
@@ -4,16 +4,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
-"PO-Revision-Date: 2012-07-12 14:17+0000\n"
+"PO-Revision-Date: 2013-11-20 13:30+0000\n"
 "Last-Translator: Jeremy Boggs <jeremy@clioweb.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/neatline/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: views/shared/coverage.php:28
 msgid "Use Map"

diff --git a/languages/fi_FI.mo b/languages/fi_FI.mo
diff --git a/languages/fi_FI.po b/languages/fi_FI.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
 "PO-Revision-Date: 2012-06-25 15:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

diff --git a/languages/fr.mo b/languages/fr.mo
diff --git a/languages/fr.po b/languages/fr.po
@@ -1,20 +1,20 @@
 # Translation for the Neatline Time plugin for Omeka.
 # 
 # Translators:
-#   <katina.rogers@gmail.com>, 2012.
+# katinalynn <katina.rogers@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
-"PO-Revision-Date: 2012-08-01 14:35+0000\n"
+"PO-Revision-Date: 2013-11-20 13:30+0000\n"
 "Last-Translator: katinalynn <katina.rogers@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/neatline/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: views/shared/coverage.php:28
 msgid "Use Map"

diff --git a/languages/it_IT.mo b/languages/it_IT.mo
diff --git a/languages/it_IT.po b/languages/it_IT.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
 "PO-Revision-Date: 2012-06-25 15:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

diff --git a/languages/nl_BE.mo b/languages/nl_BE.mo
diff --git a/languages/nl_BE.po b/languages/nl_BE.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
-"PO-Revision-Date: 2013-06-23 16:28+0000\n"
+"PO-Revision-Date: 2013-11-20 13:30+0000\n"
 "Last-Translator: Sam Alloing <sam.alloing@gmail.com>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/neatline/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"

diff --git a/languages/pt_BR.mo b/languages/pt_BR.mo
diff --git a/languages/pt_BR.po b/languages/pt_BR.po
@@ -1,14 +1,14 @@
 # Translation for the Neatline Time plugin for Omeka.
 # 
 # Translators:
-# tamiel, 2014
+# Tel, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
 "Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
 "PO-Revision-Date: 2014-01-09 17:43+0000\n"
-"Last-Translator: tamiel\n"
+"Last-Translator: Tel\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/neatline/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/languages/ru.mo b/languages/ru.mo
diff --git a/languages/ru.po b/languages/ru.po
@@ -1,20 +1,20 @@
 # Translation for the Neatline Time plugin for Omeka.
 # 
 # Translators:
-#   <or8r@virginia.edu>, 2012.
+# Oguljan <or8r@virginia.edu>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Neatline\n"
-"Report-Msgid-Bugs-To: http://github.com/scholarslab/\n"
+"Report-Msgid-Bugs-To: http://github.com/scholarslab/NeatlineFeatures/issues\n"
 "POT-Creation-Date: 2012-06-25 10:00-0500\n"
-"PO-Revision-Date: 2012-08-24 17:15+0000\n"
+"PO-Revision-Date: 2013-11-20 13:30+0000\n"
 "Last-Translator: Oguljan <or8r@virginia.edu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/neatline/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: views/shared/coverage.php:28
 msgid "Use Map"

diff --git a/models/Table/Table_NeatlineFeature.php b/models/Table/Table_NeatlineFeature.php
@@ -365,7 +365,7 @@ private function _param($params, $key, $default=null)
     {
         $value = $default;
         try {
-            if (array_key_exists($key, $params)) {
+            if (array_key_exists($key, $params) && !empty($params[$key])) {
                 $value = $params[$key];
             }
         } catch (Exception $e) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name"         : "neatlinefeatures",
-    "version"      : "2.0.2",
+    "version"      : "2.0.3",
     "dependencies" : {
         "inireader"     : "~0.2.4",
         "iniparser"     : "~1.0.5",

diff --git a/plugin.ini b/plugin.ini
@@ -8,7 +8,7 @@ author="Scholars' Lab"
 description="Allows administrators to draw things on maps and associate them with an Omeka item."
 link="https://github.com/scholarslab/NeatlineFeatures"
 support_link="https://github.com/scholarslab/NeatlineFeatures/issues"
-version="2.0.2"
+version="2.0.3"
 tags="geospatial"
 omeka_minimum_version="2.0"
 omeka_tested_up_to="2.0"

diff --git a/version b/version
@@ -1 +1 @@
-2.0.2
+2.0.3