Browse Source

Merge pull request #49 in DESIGN/design from ~NEIL/design-10:feature/10.0 to feature/10.0

* commit '45db1f86a6415f9ed67617a1b79a04f1f23cffac':
  无JIRA任务,拼写错误.
master
superman 7 years ago
parent
commit
6c81ea4a5f
  1. 4
      designer-base/src/com/fr/design/formula/FunctionNAD.java

4
designer-base/src/com/fr/design/formula/FunctionNAD.java

@ -25,9 +25,9 @@ public class FunctionNAD extends AbstractNameAndDescription {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
Locale locale = FRContext.getLocale(); Locale locale = FRContext.getLocale();
String describtion = fn.getDescribtion(locale); String describtion = fn.getDescription(locale);
if (describtion.startsWith(CalculatorEmbeddedFunction.LOCALE_PREFIX)) { if (describtion.startsWith(CalculatorEmbeddedFunction.LOCALE_PREFIX)) {
// 老的自定义函数兼容, 没有重写getDescribtion // 老的自定义函数兼容, 没有重写getDescription
return Locale.CHINA.equals(locale) ? fn.getCN() : fn.getEN(); return Locale.CHINA.equals(locale) ? fn.getCN() : fn.getEN();
} }

Loading…
Cancel
Save