Skip to content

Commit ce2e3c7

Browse files
committed
Merge branch 'master' of github.com:xbgmsharp/piwigo-openstreetmap
2 parents 1616db0 + ca7c79d commit ce2e3c7

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

admin/admin_photo.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@
155155
// Easy access
156156
define('osm_place_table', $prefixeTable.'osm_places');
157157
// Save location, eg Place
158-
$list_of_places = [];
159-
$available_places = [];
158+
$list_of_places = array();
159+
$available_places = array();
160160
$query = '
161161
SELECT id, name, latitude, longitude
162162
FROM '.osm_place_table.'
@@ -165,7 +165,7 @@
165165
// JS for the template
166166
while ($row = pwg_db_fetch_assoc($result))
167167
{
168-
$list_of_places[$row['id']] = [$row['name'], $row['latitude'], $row['longitude'] ];
168+
$list_of_places[$row['id']] = array($row['name'], $row['latitude'], $row['longitude']);
169169
$available_places[$row['id']] = $row['name'];
170170
}
171171

admin/admin_tag.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
if ( $tag_groups == 1 and isset($_POST['osm_tag_submit']) )
6464
{
6565
// Override default value from the form
66+
$tmp = preg_split("/_/",$_POST['language']);
6667
$sync_options = array(
6768
'overwrite' => isset($_POST['overwrite']),
6869
'simulate' => isset($_POST['simulate']),
@@ -77,7 +78,7 @@
7778
'osm_tag_address_country' => isset($_POST['osm_tag_address_country']),
7879
'osm_tag_address_postcode' => isset($_POST['osm_tag_address_postcode']),
7980
'osm_tag_address_country_code' => isset($_POST['osm_tag_address_country_code']),
80-
'language' => preg_split("/_/",$_POST['language'])[0]
81+
'language' => $tmp[0],
8182
);
8283

8384
// TODO allow to filter on overwrite
@@ -211,7 +212,7 @@
211212
//print_r($tag_ids);
212213
if (!empty($tag_ids))
213214
{
214-
add_tags($tag_ids, [$image['id']]);
215+
add_tags($tag_ids, array($image['id']));
215216
}
216217
}
217218
$datas[] = $image['id'];

language/br_FR/plugin.lang.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,6 @@
4949
$lang['WIDTH'] = 'Ledander ar gartenn';
5050
$lang['SHOW_COORD'] = 'Diskouez ar c\'henvuzulioù';
5151
$lang['DISPLAY_ON_MAP'] = 'Diskwel %s war ur gartenn';
52-
$lang['DISPLAY'] = 'Diskwel ar c\'hefluniadur';
52+
$lang['DISPLAY'] = 'Diskwel ar c\'hefluniadur';
53+
$lang['ATTRPLUGIN'] = 'Diskouez notennoù an aozer';
54+
$lang['ATTRLEAFLET'] = 'Diskouez notennoù al levraoueg';

0 commit comments

Comments
 (0)