From fb7499fe194a3457642e136cbc2a5ede4344e08c Mon Sep 17 00:00:00 2001 From: Matti Lassila Date: Sun, 6 Apr 2014 12:13:24 +0300 Subject: [PATCH 1/6] Geolocation support for CSV import. Has an option to import raw WGS84 coordinates in addition to Google Maps API -based geocoding. --- GeolocationPlugin.php | 104 +++++++++++++++++++++++++++++++++++++++--- config_form.php | 47 +++++++++++++++++++ 2 files changed, 145 insertions(+), 6 deletions(-) diff --git a/GeolocationPlugin.php b/GeolocationPlugin.php index d766e0d..a5b600c 100644 --- a/GeolocationPlugin.php +++ b/GeolocationPlugin.php @@ -81,6 +81,10 @@ public function hookInstall() set_option('geolocation_per_page', GEOLOCATION_DEFAULT_LOCATIONS_PER_PAGE); set_option('geolocation_add_map_to_contribution_form', '1'); set_option('geolocation_use_metric_distances', '1'); + set_option('geolocation_default_loc_set', 'Dublin Core'); + set_option('geolocation_default_loc_field', 'Coverage'); + set_option('geolocation_use_in_import','0'); + set_option('geolocation_use_coordinates','0'); } public function hookUninstall() @@ -92,10 +96,18 @@ public function hookUninstall() delete_option('geolocation_per_page'); delete_option('geolocation_add_map_to_contribution_form'); delete_option('geolocation_use_metric_distances'); + delete_option('geolocation_use_coordinates'); // This is for older versions of Geolocation, which used to store a Google Map API key. delete_option('geolocation_gmaps_key'); + // CSV import Geolocation support + + delete_option('geolocation_default_loc_set'); + delete_option('geolocation_default_loc_field'); + delete_option('geolocation_use_in_import'); + + // Drop the Location table $db = get_db(); $db->query("DROP TABLE IF EXISTS `$db->Location`"); @@ -136,6 +148,11 @@ public function hookConfig($args) set_option('geolocation_link_to_nav', $_POST['geolocation_link_to_nav']); set_option('geolocation_use_metric_distances', $_POST['geolocation_use_metric_distances']); set_option('geolocation_map_type', $_POST['map_type']); + set_option('geolocation_default_loc_set', $_POST['geolocation_default_loc_set']); + set_option('geolocation_default_loc_field', $_POST['geolocation_default_loc_field']); + set_option('geolocation_use_in_import', $_POST['geolocation_use_in_import']); + set_option('geolocation_use_coordinates',$_POST['geolocation_use_coordinates']); + } public function hookDefineAcl($args) @@ -169,13 +186,31 @@ public function hookDefineRoutes($args) public function hookAfterSaveItem($args) { - if (!($post = $args['post'])) { - return; + // Let's check if there's CSV import process going on and are we willing to use + // Geolocation in current import + $db = Zend_Registry::get('bootstrap')->getResource('db'); + $table = $db->getTable('CsvImport_Import'); + $sql = $table->getSelectForCount()->where('`status` = ?'); + $importInProgress = $db->fetchOne($sql, 'in_progress'); + $useCoords = get_option('geolocation_use_in_import'); + debug('CSV-testi'); + if ($importInProgress && $useCoords ) { + $geolocation_with_csv = true; + ChromePHP::log('Geolocation with CSV'); + $item = $args['record']; + $coordinates_or_address = metadata($item, array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); + debug(array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); + + } + + if (!($post = $args['post']) && !($geolocation_with_csv)) { + return; + } $item = $args['record']; // If we don't have the geolocation form on the page, don't do anything! - if (!$post['geolocation']) { + if (!$post['geolocation'] && !($geolocation_with_csv)) { return; } @@ -194,9 +229,66 @@ public function hookAfterSaveItem($args) } $location->setPostData($geolocationPost); $location->save(); - // If the form is empty, then we want to delete whatever location is - // currently stored - } else { + + } elseif ($geolocation_with_csv){ + $coordinates_or_address = metadata($item, array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); + if (get_option('geolocation_use_coordinates')) { + $rawCoordinates = explode(',', $coordinates_or_address); + $latitude = substr($rawCoordinates[0],4); + $longitude = substr($rawCoordinates[1],0,-1); + $location = new Location; // Create new location object for this new item + $location->item_id = $item->id; + $location->latitude = $latitude; + $location->longitude = $longitude; + $location->address = $latitude .'.'.$longitude; + $location->zoom_level = get_option('geolocation_default_zoom_level'); // use the default zoom level + $location->map_type = "Google Maps v".GOOGLE_MAPS_API_VERSION; + $location->save(); + } + else { + try { + // Get the value of the default location element of this item. + $address = metadata($item, array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); + + if ($address != "") { + // Make a request to the Google Geocoding API + $client = new Zend_Http_Client('http://maps.googleapis.com/maps/api/geocode/xml?address='.urlencode($address).'&sensor=false'); + $response = $client->request(); + + if ($response->isSuccessful()) { + $body = $response->getBody(); + $data = simplexml_load_string($body); + + if ($data->status == "OK") { + $lat = $data->result->geometry->location->lat; + $lng = $data->result->geometry->location->lng; + // Get lat and lng from XML results + + $location = new Location; // Create new location object for this new item + $location->item_id = $item->id; + $location->latitude = $lat; + $location->longitude = $lng; + $location->address = $address; + $location->zoom_level = get_option('geolocation_default_zoom_level'); // use the default zoom level + $location->map_type = "Google Maps v".GOOGLE_MAPS_API_VERSION; + + $location->save(); + } + } + } + } catch (Exception $e) { + // Invalid field for this item, or some other issue. So, just don't do anything. + } + + } + + } + + + // If the form is empty, then we want to delete whatever location is + // currently stored + + else { if ($location) { $location->delete(); } diff --git a/config_form.php b/config_form.php index 1235b7c..0e4165b 100644 --- a/config_form.php +++ b/config_form.php @@ -130,3 +130,50 @@ + +
+
+ +
+
+

+
+ formCheckbox('geolocation_use_in_import', true, + array('checked'=>(boolean)get_option('geolocation_use_in_import'))); ?> +
+
+
+ +
+
+ +
+
+
+ + + +

The location of new items will automatically be set to the position in this field.

+
+
+
+
+
+ +
+
+

+
+ formCheckbox('geolocation_use_coordinates', true, + array('checked'=>(boolean)get_option('geolocation_use_coordinates'))); ?> +
+
+
+ From a11e646c2d06a5528a96160b37357f9859fa2f95 Mon Sep 17 00:00:00 2001 From: Matti Lassila Date: Sun, 6 Apr 2014 12:13:52 +0300 Subject: [PATCH 2/6] Updated Finnish localization. --- languages/fi_FI.mo | Bin 4473 -> 5639 bytes languages/fi_FI.po | 100 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 87 insertions(+), 13 deletions(-) diff --git a/languages/fi_FI.mo b/languages/fi_FI.mo index 4de2c03c2c07119607219e22b53bd726fb0b12f3..373186f31a6e5aea59cefadbf74b4b9ef211a214 100644 GIT binary patch delta 2158 zcmZ{k+iz4w9LJ|XX`xpt7b^k-DwkfiH=w0SO`sAev|4Goih)DVl%4MGIqRO;HXBWv z5ECyk@!_PtV4^W=jKuf=iI+!R{sP}L>VqW47vI5z#Lw^Sa!Yiwb3SLfv-A6XzrWw~ z-mZ6gmVfV9v!WOS%x9V9I;F;8&uSiwku^&7!$YtOE zupJt>0WQK0_%39tx(=UHYFT~Ci~R65+zNk%vhgn54x830)d{=cF8C6B3SNbL)SEoM zg4bXP_BALq1HXi=@IKrIn;Wa=bwN320`4Hb%JL!`K7eQ74JhL4)+xoSs)wSu6>^s9 zhJ4geZ9N9xV0{#xg5ScI;d*R%2A+ojbZ`*fff8?XlTw?AulDn@5uSki;3X&yyazEs zeGKnXme1f`*4JAI4sXL0ybE7|dyxA*oPy$5Lz_~3rFKGbtPe^_#vwW zBsU4DZh6R%`ilb2RjZgXnwj;<+mjC|i8P=LaY+=2YO!9*_cT+k+D@i4o+KUzEuD9@PJ-Al(DT-0eLWWj&a*+J&mNl@+21=Ch6UdSq!H=J zTQt75>C5qxd8_sNY#1$I|DVu#8;X)}MZv3L}fz7qwJ+fDw zj!e}AJb7qB{Bz^I_Wiy6d=Bb?!O{NV?*74Bf2>Q@b)M@zW&%_2Tv!;@)1mRL(*vmk zso}V-=}zlnrJO}TrL6mV2S(y8&7+6)ly$75VzFRyd8@O~ z`8MMfobz;0DVLn#ca?H*Yr1)NU3$_+veLL`Y~(_lMt@`%SW^XS{Lo3)^g6FdgiMG* z4);tD7*`B*-m@7m(1Fbnm}r_ENy%}UZ%v^{7f~cHp4zZA{;;L7>3kXksavj6jz4O7 z+n;$9%Y_*exI~p?l}+-jwbB#kKFoj=Je@0sei%jG|F=}!+;%z+TGwy~>-{4q z@dq8QRLbYAs%YBn#kt7OmWeZKVw|{e%p!H4%b{TVj zfu$N6v6XUxPOVz6MQ5cPAyRwdq$@sVoU?gxD6zBZFZSB_r?!RWYUpZ~ad-PCqtzfu frCdn5NvVoq5LgURC#BrPNN(ff5l|NY(Ei=O=_1(c delta 1051 zcmX}rOGs2<6u|N0dwk3|j-#bDb+ZO~s0^B6vnqOEVj3zIMbwSPygColI~pw-s)bM> z(MJSUWnLWMVk zh;ppu*qbNPhRJ;1h+PFDG2D$?aSZjo8I0o-?8hIt3Ofr$%J38hF@;rl0Yi8VdC6Vg zHj3or0Vn$4b6kTTP;ZnXk#$gwb=ZQ{*oBYqB=(`dSR{fr>is!vz}vVUpRRoW4hQ)B z2gy|iO0x8N7l1nWw@9HkML=voVI=6Y4RNGry% z8PgcW8JxyN)Pi~|NS^g2$%$5W9<^oD$USlgHPeTv70#h9`~sWsE!JYdzq~b3)P)YA zg%fxQZ{l&R4=gWyZpG`E(>;B}iT=rLp<9wd{och6yo!hMC5~bvS#QD_ z)C3lA5I>@BK@S5!b0mW_$_wo%krRs0LGVH!<{2;h`sGVH242;g7^C5Z4xsMwztH3~ z0Sfgxsn>Ou$j>W42XZwBJNG{{v54$hZnX{|MGIT+g=VXv`=p^0tfAYXe~cRauo4^Q z+X^f5t2+|TnIYF2%#2wF+(gPcXpfqU#j^!nwrgg6`^~qKu&MEVHG$HI*;hJY0%bi# zlg?>($n=zUnrCHwrn~%mu(c_+qbau2inYgEw{MHZ=6fre^UN*(`)E3oOxl)fJJz`4 zF5a`ov)QpkYSghtG9#I^?Tjb0BUy7L5T7rujOLj)HFah-=raq!%jR*Y-~6sBGm+4* l+CFF4cG7NQ*yeX8vNn$oxsEwj-D&c}LuM*GZI0B;{RKQji0c3V diff --git a/languages/fi_FI.po b/languages/fi_FI.po index fe2f824..3421a33 100644 --- a/languages/fi_FI.po +++ b/languages/fi_FI.po @@ -1,7 +1,7 @@ # Translation for the Geolocation plugin for Omeka. # Copyright (C) 2011 Roy Rosenzweig Center for History and New Media # This file is distributed under the same license as the Omeka package. -# +# # Translators: # Matti Lassila , 2013 msgid "" @@ -9,14 +9,16 @@ msgstr "" "Project-Id-Version: Omeka\n" "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n" "POT-Creation-Date: 2012-01-09 21:49-0500\n" -"PO-Revision-Date: 2013-06-09 08:34+0000\n" +"PO-Revision-Date: 2014-04-06 12:07+0200\n" "Last-Translator: Matti Lassila \n" -"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/omeka/language/fi_FI/)\n" +"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/omeka/" +"language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.7\n" #: GeolocationPlugin.php:334 GeolocationPlugin.php:340 #: GeolocationPlugin.php:364 @@ -47,7 +49,8 @@ msgstr "Sijainteja sivua kohti" msgid "" "The number of locations displayed per page when browsing the map. (Maximum " "is " -msgstr "Kerralla näytettyjen sijaintien määrä karttaselausnäkymässä. (Enimmäismäärä " +msgstr "" +"Kerralla näytettyjen sijaintien määrä karttaselausnäkymässä. (Enimmäismäärä " #: config_form.php:16 msgid "Default Latitude" @@ -57,7 +60,9 @@ msgstr "Pohjoiskoordinaatti" msgid "" "Latitude of the map's initial center point, in degrees. Must be between -90 " "and 90." -msgstr "Kartan aloitusnäkymän koordinaattikeskipiste asteina. Arvon tulee olla välillä -90 ja 90." +msgstr "" +"Kartan aloitusnäkymän koordinaattikeskipiste asteina. Arvon tulee olla " +"välillä -90 ja 90." #: config_form.php:28 msgid "Default Longitude" @@ -67,7 +72,9 @@ msgstr "Itäkoordinaatti" msgid "" "Longitude of the map's initial center point, in degrees. Must be between " "-180 and 180." -msgstr "Kartan aloitusnäkymän koordinaattikeskipiste asteina. Arvon tulee olla välillä -180 ja 180." +msgstr "" +"Kartan aloitusnäkymän koordinaattikeskipiste asteina. Arvon tulee olla " +"välillä -180 ja 180." #: config_form.php:40 msgid "Default Zoom Level" @@ -77,17 +84,46 @@ msgstr "Zoomausaste" msgid "" "An integer greater than or equal to 0, where 0 represents the most zoomed " "out scale." -msgstr "Aloitusnäkymän zoomausaste. Arvon tulee olla nolla tai sitä suurempi kokonaisluku. Arvolla nolla kartta on zoomattu kauimpaan asetukseensa." +msgstr "" +"Aloitusnäkymän zoomausaste. Arvon tulee olla välillä 0-18. Arvolla nolla " +"kartta on zoomattu kauimpaan asetukseensa. Mitä suurempi luku, sen " +"yksityiskohtaisempi kartta näytetään." #: config_form.php:52 msgid "Width for Item Map" msgstr "Aineistonäkymän kartan leveys" +#: config_form.php:52 +msgid "Map Type" +msgstr "Kartan tyyppi" + +#: config_form.php:52 +msgid "The type of map to display" +msgstr "Karttanäkymän karttatyyppi" + +#: config_form.php:52 +msgid "Roadmap" +msgstr "Maantiekartta" + +#: config_form.php:52 +msgid "Satellite" +msgstr "Ilmakuva" + +#: config_form.php:52 +msgid "Hybrid" +msgstr "Yhdistelmä" + +#: config_form.php:52 +msgid "Terrain" +msgstr "Maasto" + #: config_form.php:55 msgid "" "The width of the map displayed on your items/show page. If left blank, the " "default width of 100% will be used." -msgstr "Karttanäkymän leveys aineistosivulla. Oletuksena kartta näytetään sivupohjan suhteen täysleveänä (100%)." +msgstr "" +"Karttanäkymän leveys aineistosivulla. Oletuksena kartta näytetään sivupohjan " +"suhteen täysleveänä (100%)." #: config_form.php:64 msgid "Height for Item Map" @@ -105,7 +141,9 @@ msgstr "Käytä mittayksikkönä kilometrejä" #: config_form.php:79 msgid "Use metric distances in proximity search." -msgstr "Käytä läheisyyteen perustuvassa haussa yksikkönä kilometrejä. Oletuksena mittayksikkö on maili." +msgstr "" +"Käytä läheisyyteen perustuvassa haussa yksikkönä kilometrejä. Oletuksena " +"mittayksikkö on maili." #: config_form.php:89 msgid "Add Link to Map on Items/Browse Navigation" @@ -121,10 +159,46 @@ msgstr "Lisää kartta julkiselle tallennuslomakkeelle" #: config_form.php:106 msgid "" -"If the Contribution plugin is installed and activated, Geolocation will add" -" a geolocation map field to the contribution form to associate a location to" -" a contributed item." -msgstr "Jos Contribution-lisäosa on asennettuna, julkisella tallennuslomakkeella voidaan näyttää karttanäkymä sijaintitietoa varten." +"If the Contribution plugin is installed and activated, Geolocation will add " +"a geolocation map field to the contribution form to associate a location to " +"a contributed item." +msgstr "" +"Jos Contribution-lisäosa on asennettuna, julkisella tallennuslomakkeella " +"voidaan näyttää karttanäkymä sijaintitietoa varten." + +#: config_form.php:136 +msgid "Use Geolocation in CSV import" +msgstr "Käytä sijaintitietoja CSV-tuonnissa" + +#: config_form.php:139 +msgid "Geolocate items during CSV import." +msgstr "" +"Lisää aineistoihin sijaintitiedot CSV-taulukkoon tallennetun paikan nimen " +"tai koordinaatin perusteella." + +#: config_form.php:149 +msgid "Location field" +msgstr "Sijaintitietokenttä" + +#: config_form.php:163 +msgid "" +"The location of new items will automatically be set to the position in this " +"field." +msgstr "" +"Aineistojen sijainniksi määritetään kentässä annettu koordinaattipiste tai " +"paikannimi." + +#: config_form.php:169 +msgid "Use WGS84 coordinates" +msgstr "Käytä WGS84 koordinaatteja" + +#: config_form.php:172 +msgid "" +"Instead of address or place name, the location field contains WGS84-" +"coordinates saved in format POS(68.073611,29.315278)." +msgstr "" +"Sijaintitietokenttä sisältää WGS84-koordinaatin tallennettuna muodossa POS" +"(68.073611,29.315278)." #: helpers/ItemGoogleMap.php:47 msgid "This item has no location info associated with it." From 800caf3d357efd2d694c9dc7b243843937b8e714 Mon Sep 17 00:00:00 2001 From: Matti Lassila Date: Sun, 6 Apr 2014 12:22:39 +0300 Subject: [PATCH 3/6] Removed debug function calls. --- GeolocationPlugin.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/GeolocationPlugin.php b/GeolocationPlugin.php index a5b600c..8c54482 100644 --- a/GeolocationPlugin.php +++ b/GeolocationPlugin.php @@ -193,10 +193,8 @@ public function hookAfterSaveItem($args) $sql = $table->getSelectForCount()->where('`status` = ?'); $importInProgress = $db->fetchOne($sql, 'in_progress'); $useCoords = get_option('geolocation_use_in_import'); - debug('CSV-testi'); if ($importInProgress && $useCoords ) { $geolocation_with_csv = true; - ChromePHP::log('Geolocation with CSV'); $item = $args['record']; $coordinates_or_address = metadata($item, array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); debug(array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); @@ -205,7 +203,6 @@ public function hookAfterSaveItem($args) if (!($post = $args['post']) && !($geolocation_with_csv)) { return; - } $item = $args['record']; From 4a59b8635e919b1dfa373f46ed06bbf3dbf96151 Mon Sep 17 00:00:00 2001 From: Matti Lassila Date: Sun, 6 Apr 2014 12:25:31 +0300 Subject: [PATCH 4/6] Removed reduntant explanation field from the settings form. --- config_form.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config_form.php b/config_form.php index 0e4165b..8edff7f 100644 --- a/config_form.php +++ b/config_form.php @@ -160,7 +160,6 @@ -

The location of new items will automatically be set to the position in this field.

From 5ea68aa9a40cef0d1d7c11ccd4f99b5b4ef4132d Mon Sep 17 00:00:00 2001 From: Matti Lassila Date: Sun, 11 May 2014 12:26:48 +0300 Subject: [PATCH 5/6] Do not throw an import error if the item doesn't have location information attached. --- GeolocationPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeolocationPlugin.php b/GeolocationPlugin.php index 8c54482..28a7f62 100644 --- a/GeolocationPlugin.php +++ b/GeolocationPlugin.php @@ -227,7 +227,7 @@ public function hookAfterSaveItem($args) $location->setPostData($geolocationPost); $location->save(); - } elseif ($geolocation_with_csv){ + } elseif ($geolocation_with_csv && !empty($coordinates_or_address)){ $coordinates_or_address = metadata($item, array(get_option('geolocation_default_loc_set'), get_option('geolocation_default_loc_field'))); if (get_option('geolocation_use_coordinates')) { $rawCoordinates = explode(',', $coordinates_or_address); From 4b07f43be4949fc17bbf5c7f3eb56b1b530592a7 Mon Sep 17 00:00:00 2001 From: Matti Lassila Date: Tue, 3 Jun 2014 21:09:53 +0300 Subject: [PATCH 6/6] Localize map heading in item view. --- GeolocationPlugin.php | 2 +- languages/fi_FI.mo | Bin 5639 -> 5674 bytes languages/fi_FI.po | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/GeolocationPlugin.php b/GeolocationPlugin.php index 28a7f62..ab78045 100644 --- a/GeolocationPlugin.php +++ b/GeolocationPlugin.php @@ -346,7 +346,7 @@ public function hookPublicItemsShow($args) $width = get_option('geolocation_item_map_width') ? get_option('geolocation_item_map_width') : ''; $height = get_option('geolocation_item_map_height') ? get_option('geolocation_item_map_height') : '300px'; $html = "
"; - $html .= '

Geolocation

'; + $html .= '

'.__('Geolocation').'

'; $html .= $view->itemGoogleMap($item, $width, $height); $html .= "
"; echo $html; diff --git a/languages/fi_FI.mo b/languages/fi_FI.mo index 373186f31a6e5aea59cefadbf74b4b9ef211a214..502a5239c4f3669019da0bc7736536d5056877b6 100644 GIT binary patch delta 1118 zcmX}rT}YEr9LMp0xh-?O*qWBwYIA8iXFX1e7#4xxtU-o}VHEOEjuzppCcX3Y0@Y<8 z(aVKh2~iTspzNlLpy;Nn>LQ5jrn|1Ao2c(^tqwcS=Q$5&=jH!D=SK2T()$wf-8M>! zx{f-#$gCH8s(4WPeP#~s#sr>6^_#&ozQQ5=g==uoZ&riHu@)zB6<)^>-bK3FV~m@5 z_LLX>@dGyDcT~sffZ2L%!UjxZGY(-8&){mjhWzXfk6E0?bC_LXwjW>P3T&u0i(ngS z+&*k(ejDRu10QZyIy}T-+HX)nh%99>7(?wmfsAPxP#f(C5r3_47qiKOs0oUw2_K+x^$bVxBWj|pY(qQhLG{~HX}hRY z6;S=oVn2F#2;brXY+-h#@=}=iPw;Y|4;wK^9<(zD)nT~OK8-or_fTg=vyxtmA{ns` zeWS#vbopO2rZ%LgYQYXwkyiTHi*>E#p_2Sd`KcY$PhF{sd&;Vgnu-FZrD2m2_=mT8T{bN_N^Pb7n{gBGOxK2 zDCr6o#=yeH6-_X1m4Co30XA;jxbKF<@9$D3oqp~u!_1s>X428O(ZsROlQLQ-{UUuk z&uj>z1$@!2d(7h4hhcn*8kfR;+{G#Uhc!6pn0avyEAb&#;WGO09WvB5vBfN5pLx(f z?qeMuq6TL15|$L21u=}xcoWa#W8`CNe0{?tu41gn>>hr_ay-F$EG<5rFN~UJ1RGf2 zp7WpqA8-cKsNnO?nek{2D&lfvE{h-^>(0I3z*oEv<0O8^G4zs#3pk4}@HKYfAJlq* z5;H&RTMrM_IEwAKfXcvoBnh^KS<3PS+j!qBV{zQatC+=B3=!@Ryo<_MQH2?QvL;l< zVyKb~Aye5DCKTx+58BZZYT+byU%m+@~k`By|`{?h^7sP}Pvgv;1~M@U)i1gV6(X>g-gWM_>N?UqoBX~QwP zG9024i+hv6BKlI(?$!Mp9}8L%O1h4in)0AMDlR2g1*)a%GBwe4w6rDN86}ld^h+0`HK%{(i; O<@po{W`0-BI{yJfQB_|6 diff --git a/languages/fi_FI.po b/languages/fi_FI.po index 3421a33..9934271 100644 --- a/languages/fi_FI.po +++ b/languages/fi_FI.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Omeka\n" "Report-Msgid-Bugs-To: http://github.com/omeka/plugin-Geolocation/issues\n" "POT-Creation-Date: 2012-01-09 21:49-0500\n" -"PO-Revision-Date: 2014-04-06 12:07+0200\n" +"PO-Revision-Date: 2014-06-03 21:08+0200\n" "Last-Translator: Matti Lassila \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/omeka/" "language/fi_FI/)\n" @@ -25,6 +25,10 @@ msgstr "" msgid "Map" msgstr "Kartta" +#: GeolocationPlugin.php:349 +msgid "Geolocation" +msgstr "Kartta" + #: GeolocationPlugin.php:373 views/public/map/browse.php:23 msgid "Browse Map" msgstr "Selaa karttaa"