SEBA-290 fix singularization of non-words
Change-Id: I27c14690a9309ee95d7a6292395b9cd3369f5a8e
diff --git a/lib/xos-genx/xosgenx/jinja2_extensions/base.py b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
index 702b554..3bfcd70 100644
--- a/lib/xos-genx/xosgenx/jinja2_extensions/base.py
+++ b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
@@ -44,6 +44,9 @@
singular = unquote(singular)
except KeyError:
singular = inflect_engine.singular_noun(field['name'])
+ if singular is False:
+ # singular_noun returns False on a noun it can't singularize
+ singular = field["name"]
return singular
@@ -53,7 +56,12 @@
plural = field['options']['plural']
plural = unquote(plural)
except KeyError:
- plural = inflect_engine.plural_noun(inflect_engine.singular_noun(field['name']))
+ singular = inflect_engine.singular_noun(field['name'])
+ if singular is False:
+ # singular_noun returns False on a noun it can't singularize
+ singular = field["name"]
+
+ plural = inflect_engine.plural_noun(singular)
return plural