You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2019/12/02 09:29:50 UTC
[myfaces-tobago] 13/19: Tobago-1999: add locale js
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit ac7c6cb628ce6aab7ad832c26c7ec4f539ef83c2
Author: Volker Weber <v....@inexso.de>
AuthorDate: Wed Sep 4 08:59:35 2019 +0200
Tobago-1999: add locale js
---
.../html/standard/standard/tag/SelectManyBoxRenderer.java | 12 ++++++++++++
.../html/standard/standard/tag/SelectOneChoiceRenderer.java | 10 ++++++++++
2 files changed, 22 insertions(+)
diff --git a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyBoxRenderer.java b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyBoxRenderer.java
index 6ec5699..4010fa6 100644
--- a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyBoxRenderer.java
+++ b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyBoxRenderer.java
@@ -21,6 +21,7 @@ package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UISelectManyBox;
import org.apache.myfaces.tobago.component.UISelectManyListbox;
+import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.SelectManyRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -49,6 +50,17 @@ public class SelectManyBoxRenderer extends SelectManyRendererBase {
return true;
}
+ @Override
+ public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ super.prepareRender(facesContext, component);
+ addSelect2LanguageJs(facesContext);
+ }
+
+ public static void addSelect2LanguageJs(FacesContext facesContext) {
+ String file = "script/contrib/select2/i18n/" + facesContext.getViewRoot().getLocale().getLanguage() + ".js";
+ FacesContextUtils.addScriptFile(facesContext, file);
+ }
+
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
if (!(component instanceof UISelectManyBox)) {
LOG.error("Wrong type: Need " + UISelectManyBox.class.getName()
diff --git a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
index 6fe0360..047b0d7 100644
--- a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
+++ b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
@@ -20,6 +20,7 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
+import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.html.Select2Options;
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
@@ -49,6 +50,15 @@ public class SelectOneChoiceRenderer extends SelectOneRendererBase {
return true;
}
+ @Override
+ public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ super.prepareRender(facesContext, component);
+
+ if (Select2Options.of((UISelectOneChoice) component).hasAnyOption()) {
+ SelectManyBoxRenderer.addSelect2LanguageJs(facesContext);
+ }
+ }
+
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
if (!(component instanceof UISelectOneChoice)) {
LOG.error("Wrong type: Need " + UISelectOneChoice.class.getName()