diff options
author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-09-13 09:36:22 +0100 |
---|---|---|
committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-09-13 09:36:22 +0100 |
commit | 80c0d00332edf4d30c80e07d877d9d872cf733f7 (patch) | |
tree | 2d8a9cd32eed49914afb46bd16315f7f2312cf35 /www/js | |
parent | aa694e3ca96cccebfe6c594a0ea15b997964fb64 (diff) | |
parent | aa1d6f8a74e44f82ad874dd5b2b24c2772deec9a (diff) |
Merge branch 'translation-fixes'master
Diffstat (limited to 'www/js')
-rw-r--r-- | www/js/map-OpenLayers.js | 2 | ||||
-rw-r--r-- | www/js/models/draft.js | 2 | ||||
-rw-r--r-- | www/js/strings.js | 2 | ||||
-rw-r--r-- | www/js/views/offline.js | 2 | ||||
-rw-r--r-- | www/js/views/photo.js | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/www/js/map-OpenLayers.js b/www/js/map-OpenLayers.js index 8a60e30..58bace6 100644 --- a/www/js/map-OpenLayers.js +++ b/www/js/map-OpenLayers.js @@ -165,7 +165,7 @@ function fixmystreet_onload() { var popup = new OpenLayers.Popup.FramedCloud("popup", feature.geometry.getBounds().getCenterLonLat(), null, - feature.attributes.title + "<br><a onclick=\"FMS.openExternal(event); return false;\" href=\"" + CONFIG.FMS_URL + "/report/" + feature.attributes.id + "\">More details</a>", + feature.attributes.title + "<br><a onclick=\"FMS.openExternal(event); return false;\" href=\"" + CONFIG.FMS_URL + "/report/" + feature.attributes.id + "\">" + FMS.strings.more_details + "</a>", { size: new OpenLayers.Size(0,0), offset: new OpenLayers.Pixel(0,-40) }, true, onPopupClose); feature.popup = popup; diff --git a/www/js/models/draft.js b/www/js/models/draft.js index ec6cff6..56d8111 100644 --- a/www/js/models/draft.js +++ b/www/js/models/draft.js @@ -21,7 +21,7 @@ if ( this.get('title') ) { desc += this.get('title'); } else { - desc += 'Untitled draft'; + desc += FMS.strings.untitled_draft; } desc += '<br><small>' + moment.utc( this.get('created') ).fromNow() + '</small>'; diff --git a/www/js/strings.js b/www/js/strings.js index 9cb6ae0..1dabd30 100644 --- a/www/js/strings.js +++ b/www/js/strings.js @@ -20,6 +20,8 @@ password: 'Please enter a password' }, strings: { + next: 'Next', + untitled_draft: 'Untitled draft', login_error: 'There was a problem logging you in. Please try again later.', logout_error: 'There was a problem logging you out. Please try again later.', login_details_error: 'There was a problem logging you in. Please check your email and password and that you have confirmed your password.', diff --git a/www/js/views/offline.js b/www/js/views/offline.js index 711f7d3..3c2f7af 100644 --- a/www/js/views/offline.js +++ b/www/js/views/offline.js @@ -90,7 +90,7 @@ that.model.set('file', file.toURL()); FMS.saveCurrentDraft(); - $('#photo-next-btn .ui-btn-text').text('Next'); + $('#photo-next-btn .ui-btn-text').text(FMS.strings.next); $('#display_photo').show(); $('#add_photo').hide(); }); diff --git a/www/js/views/photo.js b/www/js/views/photo.js index bbef5fa..8891298 100644 --- a/www/js/views/photo.js +++ b/www/js/views/photo.js @@ -92,7 +92,7 @@ that.model.set('file', file.toURL()); FMS.saveCurrentDraft(); - $('#photo-next-btn .ui-btn-text').text('Next'); + $('#photo-next-btn .ui-btn-text').text(FMS.strings.next); $('#id_photo_button').parents('.ui-btn').hide(); $('#id_existing').parents('.ui-btn').hide(); $('#photo').show(); |