Author: hoang_to Date: 2011-10-26 00:24:24 -0400 (Wed, 26 Oct 2011) New Revision: 7884 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java Log: GTNPORTAL-2223: Add page wizard label in French Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-10-26 03:33:55 UTC (rev 7883) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-10-26 04:24:24 UTC (rev 7884) @@ -107,7 +107,7 @@ UIPortalComposer.action.ViewProperties=Propriétés du portail UIPortalComposer.action.SwitchMode=Changer mode de vue UITabPane.title.UIApplicationList=Applications -UITabPane.title.UIContainerList=Containers +UITabPane.title.UIContainerList=Conteneurs ############################################################################# #Container config options # @@ -1093,11 +1093,11 @@ ################################################################################ UIDropDownControl.title.Empty=Drop Down Control -UIDropDownPageTemp.item.normalPageConfigs=Configs Page -UIDropDownPageTemp.item.columnPageConfigs=Configs Page en Colonnes -UIDropDownPageTemp.item.mixPageConfigs=Configs Page Mixte -UIDropDownPageTemp.item.rowPageConfigs=Configs Page en Lignes -UIDropDownPageTemp.item.tabsPageConfigs=Config Page en Onglets +UIDropDownPageTemp.item.normalPageConfigs=Configuration de la page +UIDropDownPageTemp.item.columnPageConfigs=En colonnes +UIDropDownPageTemp.item.mixPageConfigs=Mixte +UIDropDownPageTemp.item.rowPageConfigs=En lignes +UIDropDownPageTemp.item.tabsPageConfigs=En onglets ################################################################################ # org.exoplatform.portal.webui.application.UIGadgetContainerManagement @@ -1276,3 +1276,18 @@ Locale.zh_CN=Chinois simplifié Locale.zh_TW=Chinois traditionnel + ####################################################################### + # org.exoplatform.webui.core.UIConfirmation # + ####################################################################### + +UIConfirmation.title.exoMessages=Message de confirmation +UIConfirmation.Close=Annuler + + ############################################################################# + # org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace # + ############################################################################# + +UIEditInlineWorkspace.confirm.close=Il y a des modifications. Etes-vous certain de fermer sans sauvegarde ? +UIEditInlineWorkspace.confirm.yes=Oui +UIEditInlineWorkspace.confirm.no=Non + Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java 2011-10-26 03:33:55 UTC (rev 7883) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java 2011-10-26 04:24:24 UTC (rev 7884) @@ -50,16 +50,10 @@ addChild(UIPortalComposer.class, null, null); addChild(UIPortalToolPanel.class, null, null); - ResourceBundle resourceBundle = WebuiRequestContext.getCurrentInstance().getApplicationResourceBundle(); - String yes = resourceBundle.getString("UIEditInlineWorkspace.confirm.yes"); - String no = resourceBundle.getString("UIEditInlineWorkspace.confirm.no"); - - List<ActionConfirm> actionConfirms = new ArrayList<ActionConfirm>(); - actionConfirms.add(new ActionConfirm("ConfirmClose", yes)); - actionConfirms.add(new ActionConfirm("AbortClose", no)); UIConfirmation uiConfirmation = addChild(UIConfirmation.class, null, null); uiConfirmation.setCaller(this); - uiConfirmation.setActions(actionConfirms); + + createActionConfirms(uiConfirmation) ; } public void setUIComponent(UIComponent uiComp) @@ -81,9 +75,21 @@ { UIConfirmation uiConfirmation = getChild(UIConfirmation.class); uiConfirmation.setMessage(message); + createActionConfirms(uiConfirmation) ; ((WebuiRequestContext)WebuiRequestContext.getCurrentInstance()).addUIComponentToUpdateByAjax(uiConfirmation); } + public void createActionConfirms(UIConfirmation uiConfirmation) { + ResourceBundle resourceBundle = WebuiRequestContext.getCurrentInstance().getApplicationResourceBundle(); + String yes = resourceBundle.getString("UIEditInlineWorkspace.confirm.yes"); + String no = resourceBundle.getString("UIEditInlineWorkspace.confirm.no"); + + List<ActionConfirm> actionConfirms = new ArrayList<ActionConfirm>(); + actionConfirms.add(new ActionConfirm("ConfirmClose", yes)); + actionConfirms.add(new ActionConfirm("AbortClose", no)); + uiConfirmation.setActions(actionConfirms); + } + static public class ConfirmCloseActionListener extends EventListener<UIEditInlineWorkspace> {