GTNPORTAL-2909 - added localization and status validation

gatein · May 7, 2013 · 5d8133c · 5d8133c
1 parent 08ee34e
commit 5d8133c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/...eb/oauth-common/src/main/java/org/gatein/security/oauth/twitter/TwitterProcessorImpl.java b/...eb/oauth-common/src/main/java/org/gatein/security/oauth/twitter/TwitterProcessorImpl.java
@@ -144,7 +144,7 @@ public InteractionState<TwitterAccessTokenContext> processOAuthInteraction(HttpS
 
     @Override
     public InteractionState<TwitterAccessTokenContext> processOAuthInteraction(HttpServletRequest httpRequest, HttpServletResponse httpResponse, String scope) throws IOException, OAuthException {
-        throw new OAuthException(OAuthExceptionCode.EXCEPTION_CODE_TWITTER_ERROR, "Thsi is currently not supported for Twitter");
+        throw new OAuthException(OAuthExceptionCode.EXCEPTION_CODE_TWITTER_ERROR, "This is currently not supported for Twitter");
     }
 
     @Override

diff --git a/web/portal/src/main/resources/locale/portal/webui_en.properties b/web/portal/src/main/resources/locale/portal/webui_en.properties
@@ -1275,6 +1275,14 @@ UIAccountSocial.msg.failed-revoke=Revocation of access token failed. Maybe your
 UIAccountSocial.msg.access-denied=Operation failed due to denied access
 UIAccountSocial.msg.oauth-error=Unspecified error during oauth flow
 
+  ################################################################################
+  #		 UIAccountSettings #
+  ################################################################################
+
+UIAccountSocial.msg.disabled=No Social networks available
+UIAccountSocial.action.link=Link social account
+UIAccountSocial.action.unlink=Unlink social account
+
   ################################################################################
   #		 UIDropDownControl # tungnd
   ################################################################################

diff --git a/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSocial.gtmpl b/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSocial.gtmpl
@@ -12,7 +12,7 @@
 				   Collection<OAuthProviderType> oauthProviders = uicomponent.getOAuthProviderTypes();
 				   if (oauthProviders.size() == 0) {
 				%>
-				       <tr><td>No Social networks available</td></tr>
+				       <tr><td><%=_ctx.appRes("UIAccountSocial.msg.disabled")%></td></tr>
 				<%
 				   } else {
 				      for(OAuthProviderType oauthPrType : oauthProviders) {
@@ -38,11 +38,11 @@
 								          uicomponent.saveURLAfterLinkSocialAccount();
 								          String linkSocialAccountURL = uicomponent.getLinkSocialAccountURL(oauthPrType);
 								%>
-							              <a href="$linkSocialAccountURL" class="ActionButton LightBlueStyle">Link social account</a>
+							              <a href="$linkSocialAccountURL" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIAccountSocial.action.link")%></a>
 								<%    } else {
 								          String link = uicomponent.getUnlinkSocialAccountURL(oauthPrType);
 								%>
-								          <a href="javascript:void(0);" onclick="$link" class="ActionButton LightBlueStyle">Unlink social account</a>
+								          <a href="javascript:void(0);" onclick="$link" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIAccountSocial.action.unlink")%></a>
 								<%    } %>
 								    </td>
 							</tr>

diff --git a/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java b/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java
@@ -90,10 +90,13 @@ public UIUserProfileInputSet(String name) {
         businessInputSet.setRendered(false);
         addUIFormInput(businessInputSet);
 
-        UIFormInputSet socialInputSet = new UIFormInputSet("SocialNetworksInfo");
-        addInput(socialInputSet, getSocialInfoKeys());
-        socialInputSet.setRendered(false);
-        addUIFormInput(socialInputSet);
+        OAuthProviderTypeRegistry registry = getApplicationComponent(OAuthProviderTypeRegistry.class);
+        if (registry.isOAuthEnabled()) {
+            UIFormInputSet socialInputSet = new UIFormInputSet("SocialNetworksInfo");
+            addInput(socialInputSet, getSocialInfoKeys());
+            socialInputSet.setRendered(false);
+            addUIFormInput(socialInputSet);
+        }
     }
 
     public void reset() {