Changeset 19479 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2026-01-30T11:59:11+01:00 (13 days ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 8 edited
-
data/imagery/WMTSTileSource.java (modified) (1 diff)
-
data/osm/DataSetMerger.java (modified) (1 diff)
-
data/validation/routines/EmailValidator.java (modified) (1 diff)
-
data/validation/tests/UntaggedNode.java (modified) (2 diffs)
-
gui/preferences/display/GPXSettingsPanel.java (modified) (1 diff)
-
io/OsmApi.java (modified) (1 diff)
-
tools/I18n.java (modified) (3 diffs)
-
tools/LanguageInfo.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
r19050 r19479 609 609 } 610 610 if (layer.format == null) { 611 // no format found - it's mandatoryparameter - can't use this layer611 // no format found - parameter is mandatory - cannot use this layer 612 612 Logging.warn(tr("Can''t use layer {0} because no supported formats were found. Layer is available in formats: {1}", 613 613 layer.getUserTitle(), -
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r19228 r19479 307 307 // It indicates a serious problem in datasets. 308 308 // For example, datasets can be fetched from different OSM servers or badly hand-modified. 309 // We should n't merge thatdatasets.309 // We should not merge these datasets. 310 310 throw new DataIntegrityProblemException(tr("Conflict in ''visible'' attribute for object of type {0} with id {1}", 311 311 target.getType(), target.getId())); -
trunk/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java
r18801 r19479 138 138 } 139 139 140 if (email.endsWith(".")) { // check this first - it 's cheap!140 if (email.endsWith(".")) { // check this first - it is cheap! 141 141 setErrorMessage(tr("E-mail address is invalid")); 142 142 return false; -
trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
r19295 r19479 62 62 public void visitKeyValue(Tagged n, String key, String value) { 63 63 if (key.toLowerCase(Locale.ENGLISH).contains("fixme") || value.toLowerCase(Locale.ENGLISH).contains("fixme")) { 64 /* translation note: do n't translate quoted words */64 /* translation note: do not translate quoted words */ 65 65 errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_FIXME) 66 66 .message(ERROR_MESSAGE, marktr("Has tag containing ''fixme''")) … … 73 73 int code = 0; 74 74 if (key.startsWith("note") || key.startsWith("comment") || key.startsWith("description")) { 75 /* translation note: do n't translate quoted words */75 /* translation note: do not translate quoted words */ 76 76 msg = marktr("Has key ''note'' or ''comment'' or ''description''"); 77 77 code = UNTAGGED_NODE_NOTE; 78 78 } else if (key.startsWith("created_by")) { 79 /* translation note: do n't translate quoted words */79 /* translation note: do not translate quoted words */ 80 80 msg = marktr("Has key ''created_by''"); 81 81 code = UNTAGGED_NODE_CREATED_BY; 82 82 } else if (key.startsWith("watch")) { 83 /* translation note: do n't translate quoted words */83 /* translation note: do not translate quoted words */ 84 84 msg = marktr("Has key ''watch''"); 85 85 code = UNTAGGED_NODE_WATCH; 86 86 } else if (key.startsWith("source")) { 87 /* translation note: do n't translate quoted words */87 /* translation note: do not translate quoted words */ 88 88 msg = marktr("Has key ''source''"); 89 89 code = UNTAGGED_NODE_SOURCE; -
trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
r19334 r19479 574 574 575 575 if (global) { 576 // Setting waypoints for gpx layer does n't make sense - waypoints are shown in marker layer that hasdifferent name - so show577 // this only for global config 576 // Setting waypoints for gpx layer does not make sense - waypoints are shown in marker layer that has 577 // different name - so show this only for global config 578 578 579 579 // waypointLabel -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r19345 r19479 998 998 return newNotes.get(0); 999 999 } 1000 // Should n'tever execute. Server will either respond with an error (caught elsewhere) or one note1000 // Should never execute. Server will either respond with an error (caught elsewhere) or one note 1001 1001 throw new OsmTransferException(tr("Note upload failed")); 1002 1002 } catch (SAXException | IOException e) { -
trunk/src/org/openstreetmap/josm/tools/I18n.java
r19395 r19479 76 76 * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#lt">Lithuanian</a>. */ 77 77 MODE_LT, 78 /** Special mode for 79 * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#lv">Latvian</a>. */ 80 MODE_LV, 78 81 /** Special mode for 79 82 * <a href="https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ru">Russian</a>. */ … … 133 136 languages.put("km", PluralMode.MODE_NONE); 134 137 languages.put("lt", PluralMode.MODE_LT); 138 languages.put("lo", PluralMode.MODE_NONE); 139 languages.put("lv", PluralMode.MODE_LV); 135 140 languages.put("mr", PluralMode.MODE_NOTONE); 136 141 languages.put("nb", PluralMode.MODE_NOTONE); 137 142 languages.put("nl", PluralMode.MODE_NOTONE); 143 languages.put("nn", PluralMode.MODE_NOTONE); 138 144 languages.put("pl", PluralMode.MODE_PL); 139 145 languages.put("pt", PluralMode.MODE_NOTONE); … … 678 684 return ((n % 10) == 1) && ((n % 100) != 11) ? 0 : (((n % 10) >= 2) 679 685 && (((n % 100) < 10) || ((n % 100) >= 20)) ? 1 : 2); 686 case MODE_LV: 687 return ((n % 10) == 1) && ((n % 100) != 11) ? 0 : (n != 0) ? 1 : 2; 680 688 case MODE_RU: 681 689 return (((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2) -
trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
r19101 r19479 67 67 } 68 68 switch (code) { 69 case "nb": /* OSM-Wiki has "no", but no "nb" */69 case "nb": case "nn": /* OSM-Wiki has "no", but no "nb" */ 70 70 return "No:"; 71 71 case "sr@latin": /* OSM-Wiki has "Sr-latn" and not Sr-latin */
Note:
See TracChangeset
for help on using the changeset viewer.
