lang(): option 'default': override value when not translated

plepe · Aug 27, 2018 · f723a9d · f723a9d
1 parent 3f1bf70
commit f723a9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/inc/lang.js b/inc/lang.js
@@ -78,7 +78,10 @@ function lang_element(str, options) {
     }
   }
 
-  if((l=str.match(/^tag:([^=]+)=(.*)$/))&&(l=lang_str["tag:*="+l[2]])) {
+  if (options.default) {
+    return options.default
+  }
+  else if((l=str.match(/^tag:([^=]+)=(.*)$/))&&(l=lang_str["tag:*="+l[2]])) {
     // Boolean values, see:
     // http://wiki.openstreetmap.org/wiki/Proposed_features/boolean_values
     return l;

diff --git a/inc/lang.php b/inc/lang.php
@@ -74,12 +74,15 @@ function lang() {
       }
     }
     elseif(!isset($lang_str[$key])) {
-      if((preg_match("/^tag:([^=]*)=(.*)$/", $key, $m))&&($k=$lang_str["tag:*={$m[2]}"])) {
+      if (isset($options['default'])) {
+        $key = $options['default'];
+      }
+      elseif((preg_match("/^tag:([^=]*)=(.*)$/", $key, $m))&&($k=$lang_str["tag:*={$m[2]}"])) {
 	// Boolean values, see:
 	// http://wiki.openstreetmap.org/wiki/Proposed_features/boolean_values
 	$key=$k;
       }
-      else if(preg_match("/^tag:(.*)(=|>|<|>=|<=|!=)([^><=!]*)$/", $key, $m)) {
+      elseif(preg_match("/^tag:(.*)(=|>|<|>=|<=|!=)([^><=!]*)$/", $key, $m)) {
 	$key=$m[3];
       }
       elseif(preg_match("/^tag:([^><=!]*)$/", $key, $m)) {