Fix subsequent fault of XX-Latn change (closes: #11)

giggls · Oct 5, 2018 · ded8e7b · ded8e7b
1 parent 1f88f8f
commit ded8e7b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+osml10n (2.5.4) unstable; urgency=medium
+
+  * Fix subsequent fault of XX-Latn change
+
+ -- Sven Geggus <[email protected]>  Fri, 05 Oct 2018 13:48:06 +0200
+
 osml10n (2.5.3) unstable; urgency=medium
 
   * further fiddling with the loc_in_brackets feature

diff --git a/plpgsql/street_abbrv.sql b/plpgsql/street_abbrv.sql
@@ -24,6 +24,12 @@ CREATE or REPLACE FUNCTION osml10n_street_abbrev(longname text, langcode text) R
   func text;
   result text;
  BEGIN
+  IF (position('-' in langcode)>0) THEN
+    return longname;
+  END IF;
+  IF (position('_' in langcode)>0) THEN
+    return longname;
+  END IF;  
   func ='osml10n_street_abbrev_'|| langcode;
   call = 'select ' || func || '(' || quote_nullable(longname) || ')';
   execute call into result;