Merge remote-tracking branch 'upstream/main'

sven-oly · May 23, 2024 · 097c277 · 097c277
2 parents 69aa913 + cd2d0d9
commit 097c277
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/executors/cpp/coll.cpp b/executors/cpp/coll.cpp
@@ -145,7 +145,7 @@ const string test_collator(json_object *json_in) {
       cout << "# Error in making RuleBasedCollator: " << label_string << " : " << test_result << endl;
 
       json_object_object_add(return_json,
-                             "error", json_object_new_string("creat rule based collator"));
+                             "error", json_object_new_string("create rule based collator"));
       no_error = false;
     }
 

diff --git a/executors/cpp/main.cpp b/executors/cpp/main.cpp
@@ -108,7 +108,7 @@ int main(int argc, const char** argv) {
         outputLine = test_likely_subtags(json_input);
       } else if (test_type == "list_fmt") {
         outputLine = test_list_fmt(json_input);
-      } else if (test_type == "lan1g_names") {
+      } else if (test_type == "lang_names") {
         outputLine = test_langnames(json_input);
       } else if (test_type == "plural_rules") {
         outputLine = TestPluralRules(json_input);