From 6b45b5656c96c7ca33bf620e4549c4593e0374ca Mon Sep 17 00:00:00 2001 From: Ly Minh Phuong Date: Thu, 14 Jun 2012 11:46:32 +0700 Subject: [PATCH] SOC-2525 Inconsistent term when performing an action --- .../plugin/UIRelationshipActivity.gtmpl | 10 +++---- .../webui/profile/UIHeaderSection.gtmpl | 18 ++++++------- .../locale/social/Webui_en.properties | 24 ++++++++--------- .../locale/social/Webui_fr.properties | 24 ++++++++--------- .../locale/social/Webui_it.properties | 26 +++++++++---------- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/component/webui/src/main/resources/groovy/social/webui/activity/plugin/UIRelationshipActivity.gtmpl b/component/webui/src/main/resources/groovy/social/webui/activity/plugin/UIRelationshipActivity.gtmpl index d44fbb1bb9..91bcd71e9b 100644 --- a/component/webui/src/main/resources/groovy/social/webui/activity/plugin/UIRelationshipActivity.gtmpl +++ b/component/webui/src/main/resources/groovy/social/webui/activity/plugin/UIRelationshipActivity.gtmpl @@ -39,9 +39,9 @@ def isConnectionRequested = (uicomponent.getTitleId() == TitleId.CONNECTION_REQUESTED); def isConnectionConfirmed = (uicomponent.getTitleId() == TitleId.CONNECTION_CONFIRMED); - def labelAccept = _ctx.appRes("UIRelationshipActivity.label.Accept"); - def labelRefuse = _ctx.appRes("UIRelationshipActivity.label.Refuse"); - def labelRevoke = _ctx.appRes("UIRelationshipActivity.label.Revoke"); + def labelConfirm = _ctx.appRes("UIRelationshipActivity.label.Confirm"); + def labelIgnore = _ctx.appRes("UIRelationshipActivity.label.Ignore"); + def labelCancel = _ctx.appRes("UIRelationshipActivity.label.Cancel"); %> <% if (activity) { //process if not null @@ -210,9 +210,9 @@ <% }%> <% if (canShowAction) { if (isReceiver) {%> - | $labelAccept | $labelRefuse + | $labelConfirm | $labelIgnore <% } else if (isSender) {%> - | $labelRevoke + | $labelCancel <% } }%> diff --git a/component/webui/src/main/resources/groovy/social/webui/profile/UIHeaderSection.gtmpl b/component/webui/src/main/resources/groovy/social/webui/profile/UIHeaderSection.gtmpl index b5e510c577..2e376da247 100644 --- a/component/webui/src/main/resources/groovy/social/webui/profile/UIHeaderSection.gtmpl +++ b/component/webui/src/main/resources/groovy/social/webui/profile/UIHeaderSection.gtmpl @@ -45,14 +45,14 @@ def componentId = uicomponent.id; def inviteToConnectLabel = _ctx.appRes(componentId + ".label.InviteToConnect"); - def connectLabel = _ctx.appRes(componentId + ".label.Connect"); - def denyLabel = _ctx.appRes(componentId + ".label.Deny"); - def revokeLabel = _ctx.appRes(componentId + ".label.Revoke"); + def confirmLabel = _ctx.appRes(componentId + ".label.Confirm"); + def ignoreLabel = _ctx.appRes(componentId + ".label.Ignore"); + def cancelLabel = _ctx.appRes(componentId + ".label.CancelRequest"); def disconnectLabel = _ctx.appRes(componentId + ".label.Disconnect"); def inviteToConnectTitle = (_ctx.appRes(componentId + ".label.InviteToConnectTitle")).replace("{0}", currentUser + ""); - def connectTitle = (_ctx.appRes(componentId + ".label.ConnectTitle")).replace("{0}", currentUser + ""); - def denyTitle = (_ctx.appRes(componentId + ".label.DenyTitle")).replace("{0}", currentUser + ""); - def revokeTitle = (_ctx.appRes(componentId + ".label.RevokeTitle")).replace("{0}", currentUser + ""); + def confirmTitle = (_ctx.appRes(componentId + ".label.ConfirmTitle")).replace("{0}", currentUser + ""); + def denyTitle = (_ctx.appRes(componentId + ".label.IgnoreTitle")).replace("{0}", currentUser + ""); + def cancelTitle = (_ctx.appRes(componentId + ".label.CancelRequestTitle")).replace("{0}", currentUser + ""); def disconnectTitle = (_ctx.appRes(componentId + ".label.DisconnectTitle")).replace("{0}", currentUser + ""); def relationship = uicomponent.getRelationship(); %> @@ -66,12 +66,12 @@ <% } %> <% } else if (contactStatus == Type.PENDING && relationship.isReceiver(viewerIdentity)) { %>   - ;return false;" >$denyLabel + ;return false;" >$ignoreLabel | - ;return false;" >$connectLabel + ;return false;" >$confirmLabel <% } else if (contactStatus == Type.PENDING && relationship.isSender(viewerIdentity)) { %>   - ;return false;" >$revokeLabel + ;return false;" >$cancelLabel <% } else if (contactStatus == Type.CONFIRMED) { %>   ;return false;" >$disconnectLabel diff --git a/component/webui/src/main/resources/locale/social/Webui_en.properties b/component/webui/src/main/resources/locale/social/Webui_en.properties index f9402656bd..751089e73b 100644 --- a/component/webui/src/main/resources/locale/social/Webui_en.properties +++ b/component/webui/src/main/resources/locale/social/Webui_en.properties @@ -57,9 +57,9 @@ UIApplicationListSelector.label.install_application=Install this application to ##################################################################################### # UIRelationshipActivity # ##################################################################################### -UIRelationshipActivity.label.Accept=Accept -UIRelationshipActivity.label.Refuse=Refuse -UIRelationshipActivity.label.Revoke=Revoke +UIRelationshipActivity.label.Confirm=Confirm +UIRelationshipActivity.label.Ignore=Ignore +UIRelationshipActivity.label.Cancel=Cancel UIRelationshipActivity.msg.You_Invited_UserName_To_Connect=You invited {0} to connect. UIRelationshipActivity.msg.UserName_Invited_You_To_Connect={0} invited you to connect. UIRelationshipActivity.msg.UserName_Invited_UserName_To_Connect={0} invited {1} to connect. @@ -298,16 +298,16 @@ UIHeaderSection.label.yourPosition=Your current Position UIHeaderSection.label.edit=Edit UIHeaderSection.label.Cancel=Cancel UIHeaderSection.label.Send=Save -UIHeaderSection.label.InviteToConnect=Invite to connect -UIHeaderSection.label.Connect=Connect -UIHeaderSection.label.Deny=Deny -UIHeaderSection.label.Revoke=Revoke -UIHeaderSection.label.Disconnect=Disconnect +UIHeaderSection.label.InviteToConnect=Connect +UIHeaderSection.label.Confirm=Confirm +UIHeaderSection.label.Ignore=Ignore +UIHeaderSection.label.CancelRequest=Cancel Request +UIHeaderSection.label.Disconnect=Remove connection UIHeaderSection.label.InviteToConnectTitle=Invite {0} to make connection -UIHeaderSection.label.ConnectTitle=Accept {0}'s invitation -UIHeaderSection.label.DenyTitle=Deny {0}'s invitation -UIHeaderSection.label.RevokeTitle=Revoke invitation to connect with {0} -UIHeaderSection.label.DisconnectTitle=Disconnect the connection to {0} +UIHeaderSection.label.ConfirmTitle=Accept {0}'s invitation +UIHeaderSection.label.IgnoreTitle=Ignore {0}'s invitation +UIHeaderSection.label.CancelRequestTitle=Cancel invitation to connect with {0} +UIHeaderSection.label.DisconnectTitle=Remove the connection with {0} UIHeaderSection.label.RevokedInfo=Invitation was canceled by someone else. UIHeaderSection.label.InvitationEstablishedInfo=Invitation was established by someone else. diff --git a/component/webui/src/main/resources/locale/social/Webui_fr.properties b/component/webui/src/main/resources/locale/social/Webui_fr.properties index 4ac1fa17a1..1eae826dab 100644 --- a/component/webui/src/main/resources/locale/social/Webui_fr.properties +++ b/component/webui/src/main/resources/locale/social/Webui_fr.properties @@ -57,9 +57,9 @@ UIApplicationListSelector.label.install_application=Intaller cette application d ##################################################################################### # UIRelationshipActivity # ##################################################################################### -UIRelationshipActivity.label.Accept=Accepter -UIRelationshipActivity.label.Refuse=Refuser -UIRelationshipActivity.label.Revoke=Retirer +UIRelationshipActivity.label.Confirm=Confirmer +UIRelationshipActivity.label.Ignore=Ignorer +UIRelationshipActivity.label.Cancel=Annuler UIRelationshipActivity.msg.You_Invited_UserName_To_Connect=Vous avez invité {0} à se connecter. UIRelationshipActivity.msg.UserName_Invited_You_To_Connect={0} vous a envoyé une demande de connexion. UIRelationshipActivity.msg.UserName_Invited_UserName_To_Connect={0} a invité {1} à se connecter. @@ -298,16 +298,16 @@ UIHeaderSection.label.yourPosition=Votre poste actuel UIHeaderSection.label.edit=Modifier UIHeaderSection.label.Cancel=Annuler UIHeaderSection.label.Send=Sauver -UIHeaderSection.label.InviteToConnect=Inviter à se connecter -UIHeaderSection.label.Connect=Se connecter -UIHeaderSection.label.Deny=Refuser -UIHeaderSection.label.Revoke=Retirer -UIHeaderSection.label.Disconnect=Se déconnecter +UIHeaderSection.label.InviteToConnect=Se connecter +UIHeaderSection.label.Confirm=Confirmer +UIHeaderSection.label.Ignore=Ignorer +UIHeaderSection.label.CancelRequest=Annuler la requête +UIHeaderSection.label.Disconnect=Supprimer la connexion UIHeaderSection.label.InviteToConnectTitle=Inviter {0} à se connecter -UIHeaderSection.label.ConnectTitle=Accepter l'invitation de {0} -UIHeaderSection.label.DenyTitle=Refuser l'invitation de {0} -UIHeaderSection.label.RevokeTitle=Retirer l'invitation à se connecter avec {0} -UIHeaderSection.label.DisconnectTitle=Se déconnecter avec {0} +UIHeaderSection.label.ConfirmTitle=Accept l'invitation de {0} +UIHeaderSection.label.IgnoreTitle=Ignorer l'invitation de {0} +UIHeaderSection.label.CancelRequestTitle=Annuler l'invitation de se connecter avec {0} +UIHeaderSection.label.DisconnectTitle=Supprimer la connexion avec {0} UIHeaderSection.label.RevokedInfo=L'invitation a été annulée par une autre personne. UIHeaderSection.label.InvitationEstablishedInfo=L'invitation a été établie par quelqu'un d'autre. diff --git a/component/webui/src/main/resources/locale/social/Webui_it.properties b/component/webui/src/main/resources/locale/social/Webui_it.properties index ff88d7f79b..2a989a9fc9 100644 --- a/component/webui/src/main/resources/locale/social/Webui_it.properties +++ b/component/webui/src/main/resources/locale/social/Webui_it.properties @@ -57,9 +57,9 @@ UIApplicationListSelector.label.install_application=Install this application to ##################################################################################### # UIRelationshipActivity # ##################################################################################### -UIRelationshipActivity.label.Accept=Acceta -UIRelationshipActivity.label.Refuse=Rifiuta -UIRelationshipActivity.label.Revoke=Revoca +UIRelationshipActivity.label.Confirm=Conferma +UIRelationshipActivity.label.Ignore=Ignore +UIRelationshipActivity.label.Cancel=Cancel UIRelationshipActivity.msg.You_Invited_UserName_To_Connect=Hai inviatato {0} a connettersi. UIRelationshipActivity.msg.UserName_Invited_You_To_Connect={0} invitate da te a connettersi. UIRelationshipActivity.msg.UserName_Invited_UserName_To_Connect={0} ha invitato {1} a connettersi. @@ -229,7 +229,7 @@ UIContactSect.msg.Invalid-url= Il collegamento non \u00e8 valido. ##################################################################################### UIDisplayProfileList.label.NoContactFound=No contact found. UIDisplayProfileList.label.ShowMoreContacts=Mostra pi\u00f9 contatti ... -UIDisplayProfileList.label.Connect=Connect +UIDisplayProfileList.label.Connect=Connettersi UIDisplayProfileList.label.Connection=Connection UIDisplayProfileList.label.InvitationSent=Invitation sent UIDisplayProfileList.label.InvitationReceived=Invitation received @@ -297,16 +297,16 @@ UIHeaderSection.label.yourPosition=La tua Posizione attuale UIHeaderSection.label.edit=Modifica UIHeaderSection.label.Cancel=Annulla UIHeaderSection.label.Send=Salva -UIHeaderSection.label.InviteToConnect=Invita a connettersi -UIHeaderSection.label.Connect=Connetti -UIHeaderSection.label.Deny=Nega -UIHeaderSection.label.Revoke=Revoca -UIHeaderSection.label.Disconnect=Disconnetti +UIHeaderSection.label.InviteToConnect=Connettersi +UIHeaderSection.label.Confirm=Confirm +UIHeaderSection.label.Ignore=Ignore +UIHeaderSection.label.CancelRequest=Cancel Request +UIHeaderSection.label.Disconnect=Remove connection UIHeaderSection.label.InviteToConnectTitle=Invita {0} a fare una connessione -UIHeaderSection.label.ConnectTitle=Accetta l'invito di {0} -UIHeaderSection.label.DenyTitle=Rifiuta l'invito di {0} -UIHeaderSection.label.RevokeTitle=Revoca l'invito a connettersi con {0} -UIHeaderSection.label.DisconnectTitle=Diconnetti la connessione con {0} +UUIHeaderSection.label.ConfirmTitle=Accept {0}'s invitation +UIHeaderSection.label.IgnoreTitle=Ignore {0}'s invitation +UIHeaderSection.label.CancelRequestTitle=Cancel invitation to connect with {0} +UIHeaderSection.label.DisconnectTitle=Remove the connection with {0} UIHeaderSection.label.RevokedInfo=Invito revocato e eliminato da qualcun altro. UIHeaderSection.label.InvitationEstablishedInfo=Invito fatto da qualcun altro.