Skip to content

Commit 933ee9c

Browse files
xbgmsharpxbgmsharp
authored
Merge pull request #180 from samwilson/l10n-messages
Add some more missing i18n strings.
2 parents a66b21a + 4b79b5f commit 933ee9c

7 files changed

Lines changed: 48 additions & 28 deletions

File tree

‎admin/admin_batchmanager.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ function osm_loc_end_element_set_global()
9191
<label>'.l10n('Longitude').' (-180=W to 180=E)
9292
<input type="text" size="9" id="osmlon" name="osmlon">
9393
</label>
94-
</label> (Empty values will erase coordinates)
95-
<label>Saved Places:
94+
</label> '.l10n( 'EMPTY_COORD_VAL_WARNING').'
95+
<label>Saved Places:
9696
<select id="osmplaces" name="osmplaces" >
9797
<option value="NULL">--</option>
9898
'. implode("\n", $place_options) . '
99-
</select>
99+
</select>
100100
<style type="text/css"> .map1 { height: '. $batch_global_height .'px !important; width:100% !important; margin: 5px; } </style>
101101
<script src="plugins/piwigo-openstreetmap/leaflet/qleaflet.jquery.js"></script>
102102
<div class="osm-map1 map1"></div>

‎admin/admin_config.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,18 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
102102
<label>{'LEFTPOPUPINFO'|@translate} : </label><br/>
103103
<div style="padding-left: 25px">
104104
<input type="checkbox" name="osm_left_popupinfo_name" value="true" {if $left_menu.popupinfo_name}checked="checked"{/if}/> {'POPUPNAME'|@translate}<br />
105-
<input type="checkbox" name="osm_left_popupinfo_img" value="true" {if $left_menu.popupinfo_img}checked="checked"{/if}/> {'POPUPTHUMB'|@translate}<br />
106-
<input type="checkbox" name="osm_left_popupinfo_link" value="true" {if $left_menu.popupinfo_link}checked="checked"{/if}/> {'POPUPLINK'|@translate}<br />
107-
<input type="checkbox" name="osm_left_popupinfo_comment" value="true" {if $left_menu.popupinfo_comment}checked="checked"{/if}/> {'POPUPCOMMENT'|@translate}<br />
105+
<input type="checkbox" name="osm_left_popupinfo_img" value="true" {if $left_menu.popupinfo_img}checked="checked"{/if}/> {'POPUPTHUMB'|@translate}<br />
106+
<input type="checkbox" name="osm_left_popupinfo_link" value="true" {if $left_menu.popupinfo_link}checked="checked"{/if}/> {'POPUPLINK'|@translate}<br />
107+
<input type="checkbox" name="osm_left_popupinfo_comment" value="true" {if $left_menu.popupinfo_comment}checked="checked"{/if}/> {'POPUPCOMMENT'|@translate}<br />
108108
<input type="checkbox" name="osm_left_popupinfo_author" value="true" {if $left_menu.popupinfo_author}checked="checked"{/if}/> {'POPUPAUTHOR'|@translate}
109109
</div>
110110
<small>{'LEFTPOPUPINFO_DESC'|@translate}</small>
111111
</li>
112112
<li>
113-
<label>{'Auto center'|@translate} : </label>
113+
<label>{'AUTO_CENTER'|@translate} : </label>
114114
<label><input id="autocenter_enabled" type="radio" name="osm_left_autocenter" value="true" {if $left_menu.autocenter}checked="checked"{/if} onchange="autocenter_toggle(this);"/> {'Yes'|@translate}</label>
115115
<label><input type="radio" name="osm_left_autocenter" value="false" {if not $left_menu.autocenter}checked="checked"{/if} onchange="autocenter_toggle(this);"/> {'No'|@translate}</label>
116-
<br/><small>{'The map will be automatically centered and zoomed to contain all infos.'|@translate}</small>
116+
<br/><small>{'AUTO_CENTER_HELP'|@translate}</small>
117117
</li>
118118
<li id="osm_left_zoom_block">
119119
<label>{'ZOOM'|@translate} : </label>

‎admin/admin_photo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
}
7474
elseif ( (strlen($lat)==0 and strlen($lon)==0) or (isset($_GET['delete_coords']) and $_GET['delete_coords'] == 1)) {
7575
$update_query = 'latitude=NULL, longitude=NULL';
76-
array_push( $page['infos'], l10n('Coordinates erased'));
76+
array_push( $page['infos'], l10n('COORDS_ERASED'));
7777
} else {
7878
$page['errors'][] = 'Both latitude/longitude must be empty or not empty';
7979
}

‎admin/admin_photo.tpl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@
5858
</div>
5959
<div style="float: left; margin: auto; padding-left:20px; vertical-align:top;" class="photoLinks">
6060
<ul style="margin:0;">
61-
<li>{'Empty values will erase coordinates'|@translate}</a></li>
62-
<li><a class="icon-trash" href="{$DELETE_URL}" onclick="return confirm('{'Are you sure?
63-
Latitude and Longitude will be delete.'|@translate|@escape:javascript}');">{'Erase coordinates'|@translate}</a></li>
61+
<li>{'EMPTY_COORD_VAL_WARNING'|@translate}</a></li>
62+
<li><a class="icon-trash" href="{$DELETE_URL}" onclick="return confirm('{'DELETE_COORDS_CONFIRMATION'|@translate|@escape:javascript}');">{'ERASE_COORDS'|@translate}</a></li>
6463
</ul>
6564
</div>
6665

‎admin/admin_place.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ $("#searchInput").on("keydown", function(e) {
7373
<form action="" method="post" id="update">
7474
{if isset($EDIT_PLACES_LIST)}
7575
<fieldset>
76-
<legend>{'Edit places'|@translate}</legend>
76+
<legend>{'EDIT_PLACES_LEGEND'|@translate}</legend>
7777
<input type="hidden" name="edit_list" value="{$EDIT_PLACES_LIST}">
7878
<table class="table2">
7979
<tr class="throw">
80-
<th>{'Current'|@translate}</th>
81-
<th>{'New'|@translate}</th>
80+
<th>{'EDIT_PLACE_CURRENT'|@translate}</th>
81+
<th>{'EDIT_PLACE_NEW'|@translate}</th>
8282
</tr>
8383
{foreach from=$places item=place}
8484
<tr>

‎admin/admin_tag.tpl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</style>
1313
{/html_head}
1414
15-
Create tags from the address base on the GPS (latitude, longitude) metadata information.
15+
Create tags from the address base on the GPS (latitude, longitude) metadata information.
1616
<br/><br/>
1717
Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" target="_blanck">plugin documentation</a> for additional information. Create an <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/issues" target="_blanck">issue</a> for support, or feedback, or feature request.
1818
@@ -76,23 +76,23 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
7676
<ul>
7777
<li>
7878
<label>
79-
{'Name of the tag group'|@translate}:
79+
{'NAME_OF_TAG_GROUP'|@translate}:
8080
<input type="text" name="osm_taggroup" value="{$sync_options.osm_tag_group}" placeholder="location" required="" size="30"/>
8181
</label>
8282
</li>
8383
<li>
84-
<label>{'Use as tag'|@translate} : </label><br/>
84+
<label>{'USE_AS_TAG'|@translate} : </label><br/>
8585
<div style="padding-left: 25px">
86-
<input type="checkbox" name="osm_tag_address_suburb" value="true" {if $sync_options.osm_tag_address_suburb}checked="checked"{/if}/> {'suburb'|@translate}<br />
87-
<input type="checkbox" name="osm_tag_address_city_district" value="true" {if $sync_options.osm_tag_address_city_district}checked="checked"{/if}/> {'city_district'|@translate}<br />
88-
<input type="checkbox" name="osm_tag_address_city" value="true" {if $sync_options.osm_tag_address_city}checked="checked"{/if}/> {'city'|@translate}<br />
89-
<input type="checkbox" name="osm_tag_address_county" value="true" {if $sync_options.osm_tag_address_county}checked="checked"{/if}/> {'county'|@translate}<br />
90-
<input type="checkbox" name="osm_tag_address_state" value="true" {if $sync_options.osm_tag_address_state}checked="checked"{/if}/> {'state'|@translate}<br />
91-
<input type="checkbox" name="osm_tag_address_country" value="true" {if $sync_options.osm_tag_address_country}checked="checked"{/if}/> {'country'|@translate}<br />
92-
<input type="checkbox" name="osm_tag_address_postcode" value="true" {if $sync_options.osm_tag_address_postcode}checked="checked"{/if}/> {'postcode'|@translate}<br />
93-
<input type="checkbox" name="osm_tag_address_country_code" value="true" {if $sync_options.osm_tag_address_country_code}checked="checked"{/if}/> {'country_code'|@translate}<br />
86+
<input type="checkbox" name="osm_tag_address_suburb" value="true" {if $sync_options.osm_tag_address_suburb}checked="checked"{/if}/> {'SUBURB'|@translate}<br />
87+
<input type="checkbox" name="osm_tag_address_city_district" value="true" {if $sync_options.osm_tag_address_city_district}checked="checked"{/if}/> {'CITY_DISTRICT'|@translate}<br />
88+
<input type="checkbox" name="osm_tag_address_city" value="true" {if $sync_options.osm_tag_address_city}checked="checked"{/if}/> {'CITY'|@translate}<br />
89+
<input type="checkbox" name="osm_tag_address_county" value="true" {if $sync_options.osm_tag_address_county}checked="checked"{/if}/> {'COUNTY'|@translate}<br />
90+
<input type="checkbox" name="osm_tag_address_state" value="true" {if $sync_options.osm_tag_address_state}checked="checked"{/if}/> {'STATE'|@translate}<br />
91+
<input type="checkbox" name="osm_tag_address_country" value="true" {if $sync_options.osm_tag_address_country}checked="checked"{/if}/> {'COUNTRY'|@translate}<br />
92+
<input type="checkbox" name="osm_tag_address_postcode" value="true" {if $sync_options.osm_tag_address_postcode}checked="checked"{/if}/> {'POSTCODE'|@translate}<br />
93+
<input type="checkbox" name="osm_tag_address_country_code" value="true" {if $sync_options.osm_tag_address_country_code}checked="checked"{/if}/> {'COUNTRY_CODE'|@translate}<br />
9494
</div>
95-
<small>{'Create tag using one or multiple value from the address part'|@translate}</small>
95+
<small>{'USE_AS_TAG_HELP'|@translate}</small>
9696
</li>
9797
9898
<li>
@@ -102,7 +102,7 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
102102
{html_options options=$language_options selected=$language_selected}
103103
</select>
104104
</div>
105-
<small>{'Fetch the result in a specific language, mostly for the country and city fields, eg: (EN:Japan, ES:Japón, FR:Japon, JP:日本)'|@translate}</small>
105+
<small>{'LANGUAGE_HELP'|@translate}</small>
106106
</li>
107107
</ul>
108108

‎language/en_UK/plugin.lang.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,26 @@
125125
$lang['OSM_ADD_PLACE'] = 'Add a place';
126126
$lang['OSM_NEW_PLACE'] = 'New place';
127127
$lang['PLACE_SELECTION'] = 'Place selection';
128+
$lang['EDIT_PLACES_LEGEND'] = 'Edit places';
129+
$lang['EDIT_PLACE_CURRENT'] = 'Current';
130+
$lang['EDIT_PLACE_NEW'] = 'New';
128131
$lang['EDIT_PLACES'] = 'Edit selected places';
129132
$lang['DELETE_PLACES'] = 'Delete selected places';
133+
$lang['EMPTY_COORD_VAL_WARNING'] = 'Empty values will erase coordinates';
134+
$lang['DELETE_COORDS_CONFIRMATION'] = 'Are you sure? Latitude and longitude will be deleted.';
135+
$lang['ERASE_COORDS'] = 'Erase coordinates';
136+
$lang['COORDS_ERASED'] = 'Coordinates erased';
137+
$lang['NAME_OF_TAG_GROUP'] = 'Name of the tag group';
138+
$lang['USE_AS_TAG'] = 'Use as tag';
139+
$lang['SUBURB'] = 'Suburb';
140+
$lang['CITY_DISTRICT'] = 'City district';
141+
$lang['CITY'] = 'City';
142+
$lang['COUNTY'] = 'County';
143+
$lang['STATE'] = 'State';
144+
$lang['COUNTRY'] = 'Country';
145+
$lang['POSTCODE'] = 'Postcode';
146+
$lang['COUNTRY_CODE'] = 'Country code';
147+
$lang['USE_AS_TAG_HELP'] = 'Create tag using one or multiple value from the address part';
148+
$lang['LANGUAGE_HELP'] = 'Fetch the result in a specific language, mostly for the country and city fields, eg: (EN:Japan, ES:Japón, FR:Japon, JP:日本)';
149+
$lang['AUTO_CENTER'] = 'Auto center';
150+
$lang['AUTO_CENTER_HELP'] = 'The map will be automatically centered and zoomed to contain all infos.';

0 commit comments

Comments
 (0)