commit a85b8920aa9f0ee52cf89c21d5aad0ace4a067e9
Author: Simon Legner <Simon.Legner@gmail.com>
Date:   2020-01-19 09:26:34 +0100

    fix #18577 - Update opening_hours.js

diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
index ba657cdf4..26b3d6e25 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -56,13 +56,12 @@ public void initialize() throws Exception {
                  Reader reader = cf.getContentReader()) {
                 ENGINE.eval("var console={};console.debug=print;console.log=print;console.warn=print;console.error=print;");
                 ENGINE.eval(reader);
-                ENGINE.eval("var opening_hours = require('opening_hours');");
                 // fake country/state to not get errors on holidays
-                ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
+                ENGINE.eval("var nominatimJSON = {address: {country_code: 'xa'}};");
                 ENGINE.eval(
                         "var oh = function (value, tag_key, mode, locale) {" +
                         " try {" +
-                        "    var conf = {tag_key: tag_key, locale: locale};" +
+                        "    var conf = {tag_key: tag_key, locale: locale, additional_rule_separator: false};" +
                         "    if (mode > -1) {" +
                         "      conf.mode = mode;" +
                         "    }" +
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
index bf4a56c84..4a6b74b35 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
@@ -91,10 +91,11 @@ public void testCheckOpeningHourSyntax2() {
         final String key = "opening_hours";
         final List<OpeningHourTest.OpeningHoursTestError> errors = openingHourTest.checkOpeningHourSyntax(key, "Mo-Tue");
         assertThat(errors, hasSize(2));
-        assertEquals(key + " - Mo-Tue <--- (Please use the abbreviation \"Tu\" for \"tue\".)", errors.get(0).getMessage());
+        assertEquals(key + " - Mo-Tue <--- (Please use the English abbreviation \"Tu\" for \"tue\".)", errors.get(0).getMessage());
         assertEquals(Severity.WARNING, errors.get(0).getSeverity());
         assertEquals(key +
                 " - Mo-Tue <--- (This rule is not very explicit because there is no time selector being used."+
+                " A time selector is the part specifying hours when the object is opened, for example \"10:00-19:00\"."+
                 " Please add a time selector to this rule or use a comment to make it more explicit.)", errors.get(1).getMessage());
         assertEquals(Severity.WARNING, errors.get(1).getSeverity());
     }
@@ -242,8 +243,5 @@ public void testPresetValues() {
     public void testTicket17932() {
         Logging.clearLastErrorAndWarnings();
         assertTrue(openingHourTest.checkOpeningHourSyntax("opening_hours", "SH off").isEmpty());
-        List<String> errors = Logging.getLastErrorAndWarnings();
-        assertFalse(errors.isEmpty());
-        assertTrue(errors.get(0), errors.get(0).contains("no SH definition"));
     }
 }