From ea7339f49a3427f6c2bbd9311319da48204bf30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Tue, 9 Jan 2018 03:30:14 -0800 Subject: [PATCH] Fixed geometry type word order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In many languages, the word for “closed” would follow the word for “line” or “area”, not precede it. Additionally, the word for “closed” may differ depending on what it modifies. --- data/core.yaml | 3 ++- dist/locales/en.json | 3 ++- modules/ui/panels/measurement.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index bfcbc11f6..0e102c74f 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -309,7 +309,8 @@ en: title: Measurement selected: "{n} selected" geometry: Geometry - closed: closed + closed_line: closed line + closed_area: closed area center: Center perimeter: Perimeter length: Length diff --git a/dist/locales/en.json b/dist/locales/en.json index b17e1411c..df1ee9e9e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -389,7 +389,8 @@ "title": "Measurement", "selected": "{n} selected", "geometry": "Geometry", - "closed": "closed", + "closed_line": "closed line", + "closed_area": "closed area", "center": "Center", "perimeter": "Perimeter", "length": "Length", diff --git a/modules/ui/panels/measurement.js b/modules/ui/panels/measurement.js index a8d269cd7..ff7369925 100644 --- a/modules/ui/panels/measurement.js +++ b/modules/ui/panels/measurement.js @@ -108,7 +108,7 @@ export function uiPanelMeasurement(context) { .text(t('info_panels.measurement.geometry') + ':') .append('span') .text( - (closed ? t('info_panels.measurement.closed') + ' ' : '') + t('geometry.' + geometry) + closed ? t('info_panels.measurement.closed_' + geometry) : t('geometry.' + geometry) ); if (entity.type !== 'relation') {