Author: vjrj_ Date: 2011-10-04 02:46:24 +0200 (Tue, 04 Oct 2011) New Revision: 1543 Added: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java Removed: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java Modified: trunk/pom.xml trunk/src/main/java/cc/kune/chat/client/ChatClient.java trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/server/InitData.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java trunk/src/main/resources/db/liquibase_changelog.xml trunk/src/main/resources/kune.properties Log: CLOSED - # 79: I18n refactorization http://kune.ourproject.org/issues/ticket/79 CLOSED - # 133: Messages not clear: "this site"? http://kune.ourproject.org/issues/ticket/133 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/pom.xml 2011-10-04 00:46:24 UTC (rev 1543) @@ -1109,7 +1109,7 @@ <plugin> <groupId>org.dstovall</groupId> <artifactId>onejar-maven-plugin</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.4.4</version> <executions> <execution> <configuration> Modified: trunk/src/main/java/cc/kune/chat/client/ChatClient.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -25,7 +25,7 @@ public interface ChatClient { public static final String CHAT_CLIENT_ICON_ID = "k-chat-icon-id"; - void addNewBuddie(String shortName); + void addNewBuddy(String shortName); void chat(String shortName); @@ -33,9 +33,9 @@ void doLogin(); - boolean isBuddie(String shortName); + boolean isBuddy(String shortName); - boolean isBuddie(XmppURI jid); + boolean isBuddy(XmppURI jid); boolean isLoggedIn(); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -223,7 +223,7 @@ } @Override - public void addNewBuddie(final String shortName) { + public void addNewBuddy(final String shortName) { roster.requestAddItem(uriFrom(shortName), shortName); } @@ -341,7 +341,7 @@ public void onSubscriptionRequestReceived(final SubscriptionRequestReceivedEvent event) { final XmppURI uri = event.getFrom(); final String nick = event.getNick(); - NotifyUser.askConfirmation(res.question32(), i18n.t("Confirm new buddie"), i18n.t( + NotifyUser.askConfirmation(res.question32(), i18n.t("Confirm new buddy"), i18n.t( "[%s] had added you as a buddy. Do you want to add him/her also?", uri.getJID().toString()), new SimpleResponseCallback() { @Override @@ -359,12 +359,12 @@ } @Override - public boolean isBuddie(final String shortName) { - return isBuddie(uriFrom(shortName)); + public boolean isBuddy(final String shortName) { + return isBuddy(uriFrom(shortName)); } @Override - public boolean isBuddie(final XmppURI jid) { + public boolean isBuddy(final XmppURI jid) { if (roster.isRosterReady()) { if (roster.getItemByJID(jid) != null) { return true; Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -19,7 +19,7 @@ */ package cc.kune.chat.client; -import cc.kune.chat.client.actions.AddAsBuddieAction; +import cc.kune.chat.client.actions.AddAsBuddyAction; import cc.kune.chat.client.actions.AddAsBuddieHeaderButton; import cc.kune.chat.client.actions.ChatClientActions; import cc.kune.chat.client.actions.ChatSitebarActions; @@ -72,7 +72,7 @@ final IsCurrentStateEditableCondition isEditableCondition, final IsBuddieCondition isBuddieCondition, final IsNotBuddieCondition isNotBuddieCondition, final IsCurrentStateAGroupCondition isGroupCondition, final IsPersonCondition isPersonCondition, - final Provider<AddAsBuddieAction> addAsBuddie, + final Provider<AddAsBuddyAction> addAsBuddie, final Provider<StartChatWithMemberAction> startChatWithMemberAction, final IsLoggedCondition isLogged, final Provider<StartChatWithThisPersonAction> startChatWithPersonAction, @@ -112,7 +112,7 @@ final Provider<MenuItemDescriptor> addAsBuddieItem = new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { - final AddAsBuddieAction action = addAsBuddie.get(); + final AddAsBuddyAction action = addAsBuddie.get(); final MenuItemDescriptor item = new MenuItemDescriptor(action); item.add(isNotMe); item.add(isNotBuddieCondition); Deleted: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -1,62 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.chat.client.actions; - -import cc.kune.chat.client.ChatClient; -import cc.kune.chat.client.ChatInstances; -import cc.kune.common.client.actions.AbstractExtendedAction; -import cc.kune.common.client.actions.Action; -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; - -public class AddAsBuddieAction extends AbstractExtendedAction { - private final ChatClient chatEngine; - - @Inject - public AddAsBuddieAction(final ChatClient chatEngine, final ChatInstances chatInstances, - final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img) { - super(); - this.chatEngine = chatEngine; - putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDIE)); - putValue(Action.SMALL_ICON, img.addGreen()); - } - - @Override - public void actionPerformed(final ActionEvent event) { - String username = null; - if (event.getTarget() instanceof GroupDTO) { - username = ((GroupDTO) event.getTarget()).getShortName(); - } else if (event.getTarget() instanceof UserSimpleDTO) { - username = ((UserSimpleDTO) event.getTarget()).getShortName(); - } - if (username != null) { - chatEngine.addNewBuddie(username); - // NotifyUser.info("Added as buddie. Waiting buddie response"); - setEnabled(false); - } - } -} Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -75,14 +75,14 @@ setState(); } }); - putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDIE)); + putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDY)); putValue(Action.SMALL_ICON, img.addGreen()); } @Override public void actionPerformed(final ActionEvent event) { - chatEngine.addNewBuddie(session.getCurrentState().getGroup().getShortName()); - // NotifyUser.info("Added as buddie. Waiting buddie response"); + chatEngine.addNewBuddy(session.getCurrentState().getGroup().getShortName()); + // NotifyUser.info("Added as buddy. Waiting buddy response"); setEnabled(false); } @@ -104,7 +104,7 @@ private void setState(final StateAbstractDTO state) { final String groupName = state.getGroup().getShortName(); final boolean imLogged = session.isLogged(); - final boolean isNotBuddie = !chatEngine.isBuddie(groupName); + final boolean isNotBuddie = !chatEngine.isBuddy(groupName); if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) { setEnabled(true); } else { Copied: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java (from rev 1538, trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -0,0 +1,62 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.chat.client.actions; + +import cc.kune.chat.client.ChatClient; +import cc.kune.chat.client.ChatInstances; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class AddAsBuddyAction extends AbstractExtendedAction { + private final ChatClient chatEngine; + + @Inject + public AddAsBuddyAction(final ChatClient chatEngine, final ChatInstances chatInstances, + final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img) { + super(); + this.chatEngine = chatEngine; + putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDY)); + putValue(Action.SMALL_ICON, img.addGreen()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + String username = null; + if (event.getTarget() instanceof GroupDTO) { + username = ((GroupDTO) event.getTarget()).getShortName(); + } else if (event.getTarget() instanceof UserSimpleDTO) { + username = ((UserSimpleDTO) event.getTarget()).getShortName(); + } + if (username != null) { + chatEngine.addNewBuddy(username); + // NotifyUser.info("Added as buddy. Waiting buddy response"); + setEnabled(false); + } + } +} Modified: trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -43,7 +43,7 @@ } private boolean isBuddie(final String targetName) { - return chatClient.isBuddie(targetName); + return chatClient.isBuddy(targetName); } private boolean isThisGroupInRoster(final GuiActionDescrip descr) { Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -88,7 +88,6 @@ ginjector.getWikiParts(); ginjector.getSiteLogoPresenter(); - ginjector.getSpacesTabPresenter(); ginjector.getChatClient(); ginjector.getCoreParts(); ginjector.getGSpaceParts(); Modified: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -157,7 +157,6 @@ * Try to use {@link SimpleHtmlSanitizer} better * */ - @Deprecated public static String escapeHtmlLight(final String source) { String result = source; if (source != null) { Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -23,6 +23,7 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; import cc.kune.core.client.sn.GroupSNPresenter; import cc.kune.core.client.sn.UserSNPresenter; import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; @@ -39,7 +40,8 @@ final Provider<UserSNPresenter> buddiesAndParticipationPresenter, final Provider<GroupSNConfActions> groupMembersConfActions, final Provider<UserSNConfActions> userSNConfActions, final Provider<AnonUsersManager> anonUsers, - final Provider<SiteUserOptionsPresenter> userOptions) { + final Provider<SiteUserOptionsPresenter> userOptions, + final Provider<SpaceSelectorPresenter> spaceSelector) { session.onAppStart(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -49,6 +51,7 @@ buddiesAndParticipationPresenter.get(); userOptions.get(); anonUsers.get(); + spaceSelector.get(); } }); } Modified: trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -3,13 +3,13 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; -import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; @@ -19,7 +19,7 @@ @Inject public AnonUsersManager(final Session session, final CookiesManager cookiesManager, - final I18nTranslationService i18n) { + final I18nUITranslationService i18n) { session.onAppStart(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -32,13 +32,14 @@ i18n.tWithNT("register", "register, in lowercase"), false); final String signin = TextUtils.generateHtmlLink("#" + SiteTokens.SIGNIN, i18n.tWithNT("sign in", "register, in lowercase"), false); + final String siteCommonName = i18n.getSiteCommonName(); NotifyUser.info( "", i18n.tWithNT( - "You did not sign-in, so you can just see some public contents in this website, " - + "but not edit or collaborate with others. Please [%s] or [%s] in order to get full access to this site tools and contents", - "This will be something like 'Please register or sign in', but instead of %s some links", - register, signin), ANON_MESSAGE_CLOSE_ICON, true); + "You did not sign-in, so you can just see some public contents in [%s], " + + "but not edit or collaborate with others. Please [%s] or [%s] in order to get full access to [%s] tools and contents", + "This will be something like 'Please register or sign in in other to get full access to this site tools', but instead of %s some links", + siteCommonName, register, signin, siteCommonName), ANON_MESSAGE_CLOSE_ICON, true); } else { if (Boolean.valueOf(anonCookie)) { // Registered already: we set the cookie for some big period again Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -175,6 +175,8 @@ true, SubscriptionMode.manual, "blue"); super.saveAutocompleteLoginData(getView().getShortName(), getView().getRegisterPassword()); final AsyncCallback<Void> callback = new AsyncCallback<Void>() { + final String siteCommonName = i18n.getSiteCommonName(); + @Override public void onFailure(final Throwable caught) { onRegistrationFailure(caught); @@ -214,20 +216,22 @@ private void showWelcolmeDialog() { NotifyUser.info( i18n.t("Welcome"), - i18n.t("Thanks for joining this site. " - + "Now you can actively participate in this site. " - + "You can also use your personal space to publish contents. " - + "Note: your email is not verified, please follow the instructions you will receive by email."), - Register.WELCOME_ID, true); + i18n.t( + "Thanks for joining [%s]. " + + "Now you can actively participate in [%s]. " + + "You can also use your personal space to publish contents. " + + "Note: your email is not verified, please follow the instructions you will receive by email.", + siteCommonName, siteCommonName), Register.WELCOME_ID, true); } private void showWelcolmeDialogNoHomepage() { NotifyUser.info( i18n.t("Welcome"), - i18n.t("Thanks for joining this site" - + "Now you can actively participate in this site. " - + "Note: your email is not verified, please follow the instructions you will receive by email."), - Register.WELCOME_ID, true); + i18n.t( + "Thanks for joining [%s]. " + + "Now you can actively participate in [%s]. " + + "Note: your email is not verified, please follow the instructions you will receive by email.", + siteCommonName, siteCommonName), Register.WELCOME_ID, true); } }; userServiceProvider.get().createUser(user, wantHomepage, callback); Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -45,6 +45,7 @@ private final KuneConstants kuneConstants; private HashMap<String, String> lexicon; private final Session session; + private String siteCommonName; @Inject public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService, @@ -167,10 +168,30 @@ return lexicon; } + public String getSiteCommonName() { + if (siteCommonName == null) { + siteCommonName = t(session.getSiteCommonName()); + } + return siteCommonName; + } + public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) { } + private void save(final String text, final String noteForTranslators) { + i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, noteForTranslators, + new AsyncCallback<String>() { + @Override + public void onFailure(final Throwable caught) { + } + + @Override + public void onSuccess(final String result) { + } + }); + } + public void setCurrentLanguage(final String newLanguage) { this.currentLanguageCode = newLanguage; } @@ -213,16 +234,7 @@ } else { // Not translated and not in db, make a petition for translation if (session.isLogged()) { - i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, - noteForTranslators, new AsyncCallback<String>() { - @Override - public void onFailure(final Throwable caught) { - } - - @Override - public void onSuccess(final String result) { - } - }); + save(text, noteForTranslators); Log.debug("Registering in db '" + text + "' as pending translation"); lexicon.put(encodeText, UNTRANSLATED_VALUE); } Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -6,511 +6,4 @@ import com.google.gwt.i18n.client.ConstantsWithLookup; public interface KuneConstants extends ConstantsWithLookup { - String aboutKune(); - - String aboutKuneTitleOfDialog(); - - String acceptThisMember(); - - String actions(); - - String addANewBuddy(); - - String addAsABuddie(); - - String admins(); - - String allowAnyUsesOfYourWorkIncludingCommercial(); - - String allowModificationsOfYourWork(); - - String alsoYouCanUploadABackground(); - - String anOrganizationWorksAsAProjectButOrganizationsMustBeALegalEntity(); - - String anyone(); - - String apacheWavePowered(); - - String aProjectIsAKindOfGroupInWhichNewMembersJoiningIsModeratedByTheProjectAdministratorsAnAdministratorIs(); - - String areYouSure(); - - String autoAcceptRequestToJoin(); - - String available(); - - String availableForChat(); - - String away(); - - String backusedInButton(); - - String blackwhiteAThemeName(); - - String blueAThemeName(); - - String buddies(); - - String busy(); - - String calendar(); - - String campAThemeName(); - - String cancel(); - - String change(); - - String changeThisWorkspaceTheme(); - - String changeToAdmin(); - - String changeToCollaborator(); - - String chat(); - - String chatAbout(); - - String chatAndCommentThis(); - - String chatWithThisMember(); - - String chatWithThisPerson(); - - String chatWithYourBuddie(); - - String choose(); - - String clear(); - - String clickToRename(); - - String clickToSelectAndConfigureThisTheme(); - - String close(); - - String closed(); - - String closedForNewMembers(); - - String closedGroupsAreSocialGroupsOfPersonsLikeFamilyFriendsBuddiesEtcWhichAreModeratedToNewMembersAndWithP(); - - String collaborators(); - - String commonLicensesForCulturalWorks(); - - String communitiesAreSocialGroupsOfPersonsWithSharedInterestsWhichAreOpenToNewMembersForInstanceTheEnvironm(); - - String community(); - - String connecting(); - - String copyleft(); - - String copyTheTextToTranslate(); - - String create(); - - String createANewBlog(); - - String createANewBlogPost(); - - String createANewChatRoom(); - - String createANewDocumentHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt(); - - String createANewDocumentThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt(); - - String createANewFolder(); - - String createANewFolderHereAFolderWillBeASectionInThePublicWeb(); - - String createANewList(); - - String createANewMeetingHere(); - - String createANewPost(); - - String createANewTask(); - - String createANewWikipageHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt(); - - String createNewGroup(); - - String currentBackgroundImage(); - - String defaultAThemeName(); - - String delete(); - - String doNotParticipateAnymoreInThisGroup(); - - String doubleClickToOpen(); - - String edit(); - - String enterLanguage(); - - String enterToThisGroupPublicChatRoom(); - - String enterToThisGroupPublicChatRoomAndInviteMembers(); - - String enterToThisRoom(); - - String errorsInfo(); - - String finishusedInButton(); - - String general(); - - String goUpOpenTheContainerFolder(); - - String greenAThemeName(); - - String greyAThemeName(); - - String groupAndPersonalSpaceWhereYouCanCreateAndPublishContentsForYourPersonalOrGroupWebSpaces(); - - String groupMembers(); - - String groupOptions(); - - String groupsInWhichThisUserParticipates(); - - String groupSPublicRoom(); - - String groupTags(); - - String groupType(); - - String helpToTranslateKune(); - - String helpWithTheTranslation(); - - String hereYouCanChangeThisValues(); - - String hereYouCanSelectTheToolsUsed(); - - String hereYouWillSeeTheArchiveOfOldConversationsInDevelopment(); - - String highcontrastAThemeName(); - - String hisHerNetwork(); - - String keywordsOrTermsAssociatedWithThisGroup(); - - String kuneDevelopmentSite(); - - String leaveThisGroup(); - - String license(); - - String licenseWizard(); - - String loading(); - - String longName(); - - String makeThisListNotPublic(); - - String media(); - - String moderateRequestToJoin(); - - String name(); - - String nConversationsUnread(); - - String newBlog(); - - String newDocument(); - - String newFolder(); - - String newGadget(); - - String newList(); - - String newMeeting(); - - String newMembersPolicy(); - - String newPoll(); - - String newPost(); - - String newRoom(); - - String newTask(); - - String newTaskFolder(); - - String newWikipage(); - - String nextusedInButton(); - - String no(); - - String notes(); - - String notPublicable(); - - String nSubscribedNPosts(); - - String offline(); - - String ok(); - - String onlyAdmins(); - - String onlyMembers(); - - String onlyYou(); - - String onlyYourBuddies(); - - String oopsSomethingHasGoneWrongWithOurServersRetryLaterPlease(); - - String open(); - - String openArchive(); - - String openTheConversationsArchiveOfThisRoom(); - - String options(); - - String organization(); - - String otherKindOfLicenses(); - - String otherPeopleThatCollaborateWithThisGroup(); - - String others(); - - String paramCreatednewContentCreatedForInstance(); - - String paramUnderLicenseParam(); - - String participate(); - - String participatesIn(); - - String pending(); - - String peopleAndGroupsCollaboratingInThisGroup(); - - String peoplePendingToBeAcceptedInThisGroupByTheAdmins(); - - String peopleThatCanAdminThisGroup(); - - String pinkAThemeName(); - - String pleaseConfirm(); - - String post(); - - String preview(); - - String project(); - - String publicDescription(); - - String publicSpaceInThisSpaceYouCanSeeAPreviewOfHowThePersonalOrGroupSpaceLooksLikeOnTheWebOutsideThisSite(); - - String pulseAltpageupOrAltpagedownToMoveUpDownInTheListWhileTranslatingAndAltVToCopyTheOriginalTextTheTrans(); - - String purpleAThemeName(); - - String reasonsNotToUseANonCommercialLicense(); - - String recommendations(); - - String redAThemeName(); - - String redblackAThemeName(); - - String register(); - - String registerANewGroup(); - - String rejectAsMember(); - - String reloadCurrentPage(); - - String reloadThis(); - - String removeCurrentBackgroundImage(); - - String removeThisMember(); - - String reportKuneIssuesProblems(); - - String requestToParticipateInThisGroup(); - - String saharaAThemeName(); - - String saving(); - - String search(); - - String searching(); - - String select(); - - String selectACreativeCommonsLicenseRecommendedForCulturalWorks(); - - String selectALicenseToShareYourGroupContentsWithOtherPeople(); - - String selectAndConfigureThePublicSpaceThemeOfThisGroup(); - - String selectAnImageInYourComputerAsTheLogoForThisGroupForBestResultsUseANxnPixelImageWeWillAutomaticallyRe(); - - String selectAnImageInYourComputerAsYourAvatarForBestResultsUseANxnPixelImageWeWillAutomaticallyResizeBigge(); - - String selectAsTheHomepage(); - - String selectLicense(); - - String selectOtherKindOfLicenses(); - - String selectTheLicenseType(); - - String setYourChatStatus(); - - String setYourGroupPreferencesHere(); - - String shortName(); - - String showHideTheChatWindow(); - - String signInToCollaborate(); - - String signOut(); - - String signOutOfChat(); - - String startAPublicAssemblyWithMembers(); - - String style(); - - String subscribe(); - - String subscribeToThisList(); - - String tags(); - - String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformOnlyUnalteredCopiesOfTheWorkNotDerivativeWo(); - - String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkAsWellAsMakeDerivativeWorksBasedOnIt(); - - String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkForNonCommercialPurposesOnly(); - - String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkIncludingForCommercialPurposes(); - - String theLicensorPermitsOthersToDistributeDerivativeWorksOnlyUnderTheSameLicenseOrOneCompatibleWithTheOneT(); - - String theMembersOfThisGroupAreNotPublic(); - - String theNameMustBeBetween3And15LowercaseCharactersItCanOnlyContainWesternCharactersAndNumbers(); - - String theNameMustContainOnlyCharactersNumbersAndDashes(); - - String thisFolderIsEmpty(); - - String thisIsACopyleftLicense(); - - String thisIsAnOrphanedProjectIfYouAreInterestedPleaseRequestToJoinToWorkOnIt(); - - String thisIsAppropriateForFreeCulturalWorks(); - - String thisIsNotACopyleftLicense(); - - String thisIsNotAppropriateForFreeCulturalWorks(); - - String thisIsOnlyAPreviewOfHowThisPageLooksLikeToTheGeneralPublicOnTheWebOutsideThisSite(); - - String thisIsTheDefaultLicenseForAllTheContentsOfThisGroupYouCanAlsoSelectAnotherDifferentLicensePerContent(); - - String thisPageIsNotPublicable(); - - String thisUserBuddies(); - - String thisUserBuddiesAndGroupsWhereParticipes(); - - String thisUserDoesNotHaveAHomepage(); - - String thoseWhoCanViewThisMemberList(); - - String thoseWhoCanViewYourNetwork(); - - String tip(); - - String to(); - - String tools(); - - String toParamForExampleToSpanish(); - - String translated(); - - String translateThis(); - - String transparentAThemeName(); - - String typeSomeKeywordThatDefineYourGroup(); - - String typeSomethingToSearchUsersAndGroupsInThisSite(); - - String untranslated(); - - String useACopyleftLicenseRecommended(); - - String useAnotherKindOfLicenseAdvanced(); - - String userOptions(); - - String userSpaceItShowsAListOfAllYourDocumentsAndContentsInWhichYouParticipate(); - - String useTheGnuLicensesRecommendedForFreeSoftwareWorksAndOtherKindOfLicenses(); - - String visitHisHerHomepage(); - - String visitThisGroupHomepage(); - - String visitThisMemberHomepage(); - - String visitYourHomepage(); - - String voting(); - - String welcomeToTheParamPublicChatRoom(); - - String weRecommendParamLicensesSpeciallyForPracticalWorks(); - - String whiteblackAThemeName(); - - String whyDoWeNeedALicense(); - - String withACreativeCommonsLicenseYouKeepYourCopyrightButAllowPeopleToCopyAndDistributeYourWorkProvidedThey(); - - String yes(); - - String yesAsLongAsOtherShareAlike(); - - String youCanChangeThisLicenseLater(); - - String youCannotDisableThisToolBecauseItSWhereTheCurrentGroupHomePageIsLocatedToDoThatYouHaveToSelectOtherC(); - - String yourGroups(); - - String yourHomepage(); - - String yourHomePageInThisSite(); - - String yourLanguage(); - - String yourPreferences(); - - String youWillDeleteItWithAllItsContentsAreYouSure(); } Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties 2011-10-04 00:46:24 UTC (rev 1543) @@ -1,256 +0,0 @@ -chatWithYourBuddie = Chat with your buddie -chatWithThisMember = Chat with this member -addAsABuddie = Add as a buddie -chat = Chat ;) -thisIsOnlyAPreviewOfHowThisPageLooksLikeToTheGeneralPublicOnTheWebOutsideThisSite = This is only a preview of how this page looks like to the general public on the web, outside this site. -preview = Preview -paramUnderLicenseParam = © [%s], under license: [%s] -clickToRename = Click to rename -createANewDocumentThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt = Create a New Document. This document will be a new 'Page' in the public web if you publish it -reloadCurrentPage = Reload current page -newDocument = New document -goUpOpenTheContainerFolder = Go up: Open the container folder -edit = Edit -chatAndCommentThis = Chat and comment this -chatAbout = Chat about -available = Available -nConversationsUnread = [%d] conversations unread -offline = Offline -connecting = Connecting -newGadget = New Gadget -voting = Voting -calendar = Calendar -media = Media -others = Others -loading = Loading -participate = Participate -options = Options -doNotParticipateAnymoreInThisGroup = Do not participate anymore in this group -requestToParticipateInThisGroup = Request to participate in this group -leaveThisGroup = Leave this group -thoseWhoCanViewThisMemberList = Those who can view this member list -newMembersPolicy = New members policy -anyone = anyone -onlyMembers = only members -onlyAdmins = only admins -moderateRequestToJoin = moderate request to join -autoAcceptRequestToJoin = auto accept request to join -closedForNewMembers = closed for new members -addANewBuddy = Add a new buddy -thoseWhoCanViewYourNetwork = Those who can view your network -onlyYourBuddies = only your buddies -onlyYou = only you -groupMembers = Group members -peopleAndGroupsCollaboratingInThisGroup = People and groups collaborating in this group -admins = Admins -peopleThatCanAdminThisGroup = People that can admin this group -collaborators = Collaborators -otherPeopleThatCollaborateWithThisGroup = Other people that collaborate with this group -pending = Pending -peoplePendingToBeAcceptedInThisGroupByTheAdmins = People pending to be accepted in this group by the admins -thisIsAnOrphanedProjectIfYouAreInterestedPleaseRequestToJoinToWorkOnIt = This is an orphaned project, if you are interested please request to join to work on it -theMembersOfThisGroupAreNotPublic = The members of this group are not public -changeToCollaborator = Change to collaborator -changeToAdmin = Change to admin -removeThisMember = Remove this member -acceptThisMember = Accept this member -rejectAsMember = Reject as member -visitThisGroupHomepage = Visit this group homepage -visitThisMemberHomepage = Visit this member homepage -visitYourHomepage = Visit your homepage -visitHisHerHomepage = Visit his/her homepage -hisHerNetwork = His/her network: -thisUserBuddiesAndGroupsWhereParticipes = This user buddies and groups where participes -buddies = Buddies -thisUserBuddies = This user buddies -participatesIn = Participates in -groupsInWhichThisUserParticipates = Groups in which this user participates -yourGroups = Your groups -yourHomepage = Your homepage -yourHomePageInThisSite = Your home page in this site -userSpaceItShowsAListOfAllYourDocumentsAndContentsInWhichYouParticipate = User space: it shows a list of all your documents and contents in which you participate -groupAndPersonalSpaceWhereYouCanCreateAndPublishContentsForYourPersonalOrGroupWebSpaces = Group and personal space: Where you can create and publish contents for your personal or group web spaces -publicSpaceInThisSpaceYouCanSeeAPreviewOfHowThePersonalOrGroupSpaceLooksLikeOnTheWebOutsideThisSite = Public space: In this space you can see a preview of how the Personal or Group Space looks like on the web, outside this site -tags = Tags -keywordsOrTermsAssociatedWithThisGroup = Keywords or terms associated with this group -typeSomethingToSearchUsersAndGroupsInThisSite = Type something to search users and groups in this site -search = Search -close = Close -groupOptions = Group options -setYourGroupPreferencesHere = Set your group preferences here -userOptions = User options -yourPreferences = Your preferences -helpWithTheTranslation = Help with the translation -showHideTheChatWindow = Show/hide the chat window -setYourChatStatus = Set your chat status -availableForChat = Available for chat -away = Away -busy = Busy -signOutOfChat = Sign out of chat -groupSPublicRoom = Group's public room -enterToThisGroupPublicChatRoom = Enter to this group public chat room -startAPublicAssemblyWithMembers = Start a public assembly with members -enterToThisGroupPublicChatRoomAndInviteMembers = Enter to this group public chat room and invite members -reportKuneIssuesProblems = Report Kune issues/problems -apacheWavePowered = Apache Wave powered -aboutKune = About kune -errorsInfo = Errors info -signInToCollaborate = Sign in to collaborate -signOut = Sign out -createNewGroup = Create New Group -kuneDevelopmentSite = kune development site -enterLanguage = Enter language -searching = Searching... -copyTheTextToTranslate = Copy the text to translate -translateThis = translate this: -notes = Notes: -tip = Tip: -pulseAltpageupOrAltpagedownToMoveUpDownInTheListWhileTranslatingAndAltVToCopyTheOriginalTextTheTrans = Pulse Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved -untranslated = Untranslated -translated = Translated -recommendations = Recommendations -helpToTranslateKune = Help to translate kune -to = to -general = General -name = Name -hereYouCanChangeThisValues = Here you can change this values: -tools = Tools -hereYouCanSelectTheToolsUsed = Here you can select the tools used: -choose = Choose -selectAnImageInYourComputerAsYourAvatarForBestResultsUseANxnPixelImageWeWillAutomaticallyResizeBigge = Select an image in your computer as your avatar. For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images. -style = Style -changeThisWorkspaceTheme = Change this workspace theme: -currentBackgroundImage = Current background image: -alsoYouCanUploadABackground = Also you can upload a background: -change = Change -clear = Clear -thisUserDoesNotHaveAHomepage = This user does not have a homepage -removeCurrentBackgroundImage = Remove current background image -selectAndConfigureThePublicSpaceThemeOfThisGroup = Select and configure the public space theme of this group: -clickToSelectAndConfigureThisTheme = Click to select and configure this theme -license = License -thisIsTheDefaultLicenseForAllTheContentsOfThisGroupYouCanAlsoSelectAnotherDifferentLicensePerContent = This is the default license for all the contents of this group (you can also select another different license per content): -notPublicable = Not Publicable -thisPageIsNotPublicable = This page is not publicable -chatWithThisPerson = Chat with this person -toParamForExampleToSpanish = to [%s]: -saving = Saving -ok = Ok -registerANewGroup = Register a new group -register = Register -cancel = Cancel -shortName = Short name -theNameMustBeBetween3And15LowercaseCharactersItCanOnlyContainWesternCharactersAndNumbers = The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers -longName = Long name -publicDescription = Public description -groupTags = Group tags -typeSomeKeywordThatDefineYourGroup = type some keyword that define your group -groupType = Group type -project = Project -aProjectIsAKindOfGroupInWhichNewMembersJoiningIsModeratedByTheProjectAdministratorsAnAdministratorIs = A project is a kind of group in which new members joining is moderated by the project administrators. An administrator is the person who creates the project and other people she/he chooses to be administrator as well. -organization = Organization -anOrganizationWorksAsAProjectButOrganizationsMustBeALegalEntity = An organization works as a project, but organizations must be a legal entity. -closed = Closed -closedGroupsAreSocialGroupsOfPersonsLikeFamilyFriendsBuddiesEtcWhichAreModeratedToNewMembersAndWithP = Closed groups are social groups of persons like family, friends, buddies, etc, which are moderated to new members and with private contents (by default) -community = Community -communitiesAreSocialGroupsOfPersonsWithSharedInterestsWhichAreOpenToNewMembersForInstanceTheEnvironm = Communities are social groups of persons with shared interests, which are open to new members (for instance the environmental community or the LGBT community). They rarely are a legal entity. -createANewDocumentHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt = Create a New Document here. This document will be a new 'Page' in the public web if you publish it -newFolder = New folder -createANewFolderHereAFolderWillBeASectionInThePublicWeb = Create a new folder here. A folder will be a 'section' in the public web -doubleClickToOpen = Double click to open -delete = Delete -open = Open -selectAsTheHomepage = Select as the homepage -actions = Actions -newBlog = New blog -createANewBlog = Create a new blog -reloadThis = Reload this -newList = New list -createANewList = Create a new list -newPost = New post -createANewBlogPost = Create a new blog post -makeThisListNotPublic = Make this list not public -createANewPost = Create a new post -subscribe = Subscribe -subscribeToThisList = Subscribe to this list -nSubscribedNPosts = [%d] subscribed, [%d] posts -newMeeting = New meeting -createANewMeetingHere = Create a New Meeting here -createANewTask = Create a new task -newTask = New task -newTaskFolder = New task folder -createANewFolder = Create a new folder -newWikipage = New wikipage -createANewWikipageHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt = Create a New Wikipage here. This document will be a new 'Page' in the public web if you publish it -youCannotDisableThisToolBecauseItSWhereTheCurrentGroupHomePageIsLocatedToDoThatYouHaveToSelectOtherC = You cannot disable this tool because it's where the current group home page is located. To do that you have to select other content as the default group home page but in another tool. -selectAnImageInYourComputerAsTheLogoForThisGroupForBestResultsUseANxnPixelImageWeWillAutomaticallyRe = Select an image in your computer as the logo for this group. For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images. -licenseWizard = License wizard -backusedInButton = « Back -nextusedInButton = Next » -finishusedInButton = Finish -select = Select -selectALicenseToShareYourGroupContentsWithOtherPeople = Select a license to share your group contents with other people: -useACopyleftLicenseRecommended = Use a copyleft license (recommended) -useAnotherKindOfLicenseAdvanced = Use another kind of license (advanced) -copyleft = copyleft -weRecommendParamLicensesSpeciallyForPracticalWorks = We recommend [%s] licenses, specially for practical works -whyDoWeNeedALicense = Why do we need a license? -youCanChangeThisLicenseLater = You can change this license later -selectTheLicenseType = Select the license type: -commonLicensesForCulturalWorks = Common licenses for cultural works -selectACreativeCommonsLicenseRecommendedForCulturalWorks = Select a Creative Commons license (recommended for cultural works) -otherKindOfLicenses = Other kind of licenses -useTheGnuLicensesRecommendedForFreeSoftwareWorksAndOtherKindOfLicenses = Use the GNU licenses (recommended for free software works) and other kind of licenses -withACreativeCommonsLicenseYouKeepYourCopyrightButAllowPeopleToCopyAndDistributeYourWorkProvidedThey = With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do? -allowAnyUsesOfYourWorkIncludingCommercial = Allow any uses of your work, including commercial? -allowModificationsOfYourWork = Allow modifications of your work? -yes = Yes -theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkIncludingForCommercialPurposes = The licensor permits others to copy, distribute, display, and perform the work, including for commercial purposes -no = No -theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkForNonCommercialPurposesOnly = The licensor permits others to copy, distribute, display, and perform the work for non-commercial purposes only -theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkAsWellAsMakeDerivativeWorksBasedOnIt = The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it -yesAsLongAsOtherShareAlike = Yes, as long as other share alike -theLicensorPermitsOthersToDistributeDerivativeWorksOnlyUnderTheSameLicenseOrOneCompatibleWithTheOneT = The licensor permits others to distribute derivative works only under the same license or one compatible with the one that governs the licensor's work -theLicensorPermitsOthersToCopyDistributeDisplayAndPerformOnlyUnalteredCopiesOfTheWorkNotDerivativeWo = The licensor permits others to copy, distribute, display and perform only unaltered copies of the work — not derivative works based on it -thisIsACopyleftLicense = This is a copyleft license. -thisIsNotACopyleftLicense = This is not a copyleft license. -thisIsAppropriateForFreeCulturalWorks = This is appropriate for free cultural works. -thisIsNotAppropriateForFreeCulturalWorks = This is not appropriate for free cultural works. -reasonsNotToUseANonCommercialLicense = Reasons not to use a non commercial license. -selectOtherKindOfLicenses = Select other kind of licenses: -selectLicense = Select license -areYouSure = Are you sure? -paramCreatednewContentCreatedForInstance = [%s] created -pleaseConfirm = Please confirm -thisFolderIsEmpty = This folder is empty -youWillDeleteItWithAllItsContentsAreYouSure = You will delete it with all its contents. Are you sure? -welcomeToTheParamPublicChatRoom = Welcome to the [%s] public chat room -createANewChatRoom = Create a new chat room -newRoom = New room -enterToThisRoom = Enter to this room -openArchive = Open archive -openTheConversationsArchiveOfThisRoom = Open the conversations archive of this room -hereYouWillSeeTheArchiveOfOldConversationsInDevelopment = Here you will see the archive of old conversations (in development) -create = Create -theNameMustContainOnlyCharactersNumbersAndDashes = The name must contain only characters, numbers and dashes -post = Post -newPoll = New poll -thisUserDoesNotHaveAHomepage = This user does not have a homepage -oopsSomethingHasGoneWrongWithOurServersRetryLaterPlease = Oops! Something has gone wrong with our servers. Retry later, please. -yourLanguage = Your language -redblackAThemeName = redblack -purpleAThemeName = purple -greenAThemeName = green -highcontrastAThemeName = highcontrast -blackwhiteAThemeName = blackwhite -campAThemeName = camp -defaultAThemeName = default -redAThemeName = red -blueAThemeName = blue -greyAThemeName = grey -saharaAThemeName = sahara -pinkAThemeName = pink -whiteblackAThemeName = whiteblack -transparentAThemeName = transparent -aboutKuneTitleOfDialog = About Kune - Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -20,7 +20,7 @@ package cc.kune.core.client.resources; public final class CoreMessages { - public final static String ADD_AS_A_BUDDIE = "Add as a buddie"; + public final static String ADD_AS_A_BUDDY = "Add as a buddy"; public final static String BUDDIES_NOT_PUBLIC = "The social network of this user is not public"; public final static String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one"; public final static String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo"; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -42,12 +42,14 @@ private final StateManager stateManager; @Inject - public SitebarSignInAction(final StateManager stateManager, final I18nTranslationService i18n) { + public SitebarSignInAction(final StateManager stateManager, final I18nTranslationService i18n, + final Session session) { super(); + final String siteCommonName = i18n.t(session.getSiteCommonName()); this.stateManager = stateManager; putValue(Action.NAME, i18n.t("Sign in to collaborate")); - putValue(Action.TOOLTIP, - i18n.t("Please sign in or register to get full access to this site tools and contents")); + putValue(Action.TOOLTIP, i18n.t( + "Please sign in or register to get full access to [%s] tools and contents", siteCommonName)); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -21,11 +21,12 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter.SitebarSearchView; +import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.SearcherConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.event.dom.client.HasAllFocusHandlers; @@ -55,8 +56,8 @@ private final SuggestBox suggestBox; @Inject - public SitebarSearchPanel(final GSpaceArmor gs, final CoreResources img, - final StateManager stateManager, final I18nTranslationService i18n) { + public SitebarSearchPanel(final GSpaceArmor gs, final CoreResources img, final Session session, + final StateManager stateManager, final I18nUITranslationService i18n) { searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); searchButton.ensureDebugId(SITE_SEARCH_BUTTON); final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox( @@ -84,8 +85,10 @@ } }; }; + final String siteCommonName = i18n.getSiteCommonName(); suggestBox = multivalueSBox.getSuggestBox(); - Tooltip.to(suggestBox, i18n.t("Type something to search for users and groups in this site")); + Tooltip.to(suggestBox, + i18n.t("Type something to search for users and groups in [%s]", siteCommonName)); searchTextBox = suggestBox.getTextBox(); searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); searchTextBox.addStyleName("k-fr"); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -20,8 +20,9 @@ package cc.kune.core.client.sitebar.spaces; import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; -import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.core.client.state.Session; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.resources.GSpaceArmorResources; @@ -55,11 +56,12 @@ private final Tooltip userSpaceTooltip; @Inject - public SpaceSelectorPanel(final GSpaceArmor armor, final I18nTranslationService i18n, - final GSpaceArmorResources res) { + public SpaceSelectorPanel(final GSpaceArmor armor, final I18nUITranslationService i18n, + final GSpaceArmorResources res, final Session session) { armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); // homeButton.setVisible(false); - homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in this site")); + final String siteCommonName = i18n.getSiteCommonName(); + homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in [%s]", siteCommonName)); userSpaceTooltip = Tooltip.to( userButton, i18n.t("User space: it shows a list of all documents and contents " + "in which you participate")); @@ -67,7 +69,7 @@ + "and publish contents for your personal or group web spaces")); publicSpaceTooltip = Tooltip.to(publicButton, i18n.t("Public space: Where you can see a preview of how your Personal or " - + "Group Space looks like on the web, outside this site")); + + "Group Space looks like on the web")); // homeSpaceTooltip.setWidth(0); userSpaceTooltip.setWidth(190); groupSpaceTooltip.setWidth(170); Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -1,302 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.sitebar.spaces; - -import cc.kune.common.client.notify.NotifyLevel; -import cc.kune.common.client.ui.MaskWidgetView; -import cc.kune.core.client.auth.SignIn; -import cc.kune.core.client.events.WindowFocusEvent; -import cc.kune.core.client.init.AppStartEvent; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteTokens; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.TokenUtils; -import cc.kune.core.client.state.UserSignOutEvent; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.GSpaceArmor; -import cc.kune.gspace.client.style.GSpaceBackManager; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.event.shared.EventBus; -import com.google.gwt.user.client.Timer; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.gwtplatform.mvp.client.Presenter; -import com.gwtplatform.mvp.client.View; -import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; -import com.gwtplatform.mvp.client.annotations.ProxyEvent; -import com.gwtplatform.mvp.client.proxy.Proxy; -import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; - -public class SpaceSelectorPresenter extends - Presenter<SpaceSelectorPresenter.SpaceSelectorView, SpaceSelectorPresenter.SpaceSelectorProxy> { - - @ProxyCodeSplit - public interface SpaceSelectorProxy extends Proxy<SpaceSelectorPresenter> { - } - - public interface SpaceSelectorView extends View { - - public static String GROUP_SPACE_ID = "k-space-group-id"; - public static String HOME_SPACE_ID = "k-space-home-id"; - public static String PUBLIC_SPACE_ID = "k-space-public-id"; - public static String USER_SPACE_ID = "k-space-user-id"; - - HasClickHandlers getGroupBtn(); - - HasClickHandlers getHomeBtn(); - - HasClickHandlers getPublicBtn(); - - HasClickHandlers getUserBtn(); - - void setGroupBtnDown(boolean down); - - void setHomeBtnDown(boolean down); - - void setPublicBtnDown(boolean down); - - void setUserBtnDown(boolean down); - - void showGroupSpaceTooltip(); - - void showHomeSpaceTooltip(); - - void showPublicSpaceTooltip(); - - void showUserSpaceTooltip(); - } - - private final GSpaceArmor armor; - private final GSpaceBackManager backManager; - private Space currentSpace; - private String groupToken; - private String homeToken; - private final I18nTranslationService i18n; - private String publicToken; - private final Session session; - private final Provider<SignIn> signIn; - private final StateManager stateManager; - private String userToken; - - @Inject - public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, - final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, - final Session session, final Provider<SignIn> signIn, final GSpaceBackManager backManager, - final I18nTranslationService i18n, final MaskWidgetView mask) { - super(eventBus, view, proxy); - this.stateManager = stateManager; - this.armor = armor; - this.session = session; - this.signIn = signIn; - this.backManager = backManager; - this.i18n = i18n; - currentSpace = null; - homeToken = SiteTokens.HOME; - userToken = SiteTokens.WAVEINBOX; - groupToken = SiteTokens.GROUP_HOME; - publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME); - view.getHomeBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - restoreToken(homeToken); - setDown(Space.homeSpace); - } - }); - view.getUserBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - restoreToken(userToken); - setDown(Space.userSpace); - } - }); - view.getGroupBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - restoreToken(groupToken); - setDown(Space.groupSpace); - } - }); - view.getPublicBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - restoreToken(publicToken); - setDown(Space.publicSpace); - } - - }); - eventBus.addHandler(WindowFocusEvent.getType(), new WindowFocusEvent.WindowFocusHandler() { - @Override - public void onWindowFocus(final WindowFocusEvent event) { - if (event.isHasFocus() && !mask.isShowing()) { - // showTooltipWithDelay(); - } - } - }); - } - - @ProxyEvent - public void onAppStart(final AppStartEvent event) { - // showTooltipWithDelay(); - } - - private void onGroupSpaceSelect(final boolean shouldRestoreToken) { - restoreToken(shouldRestoreToken, groupToken); - armor.selectGroupSpace(); - backManager.restoreBackImage(); - setDown(Space.groupSpace); - currentSpace = Space.groupSpace; - } - - private void onHomeSpaceSelect(final boolean shouldRestoreToken) { - restoreToken(shouldRestoreToken, homeToken); - armor.selectHomeSpace(); - backManager.clearBackImage(); - setDown(Space.homeSpace); - currentSpace = Space.homeSpace; - } - - private void onPublicSpaceSelect(final boolean shouldRestoreToken) { - restoreToken(shouldRestoreToken, userToken); - armor.selectPublicSpace(); - backManager.restoreBackImage(); - setDown(Space.publicSpace); - currentSpace = Space.publicSpace; - } - - @ProxyEvent - public void onSpaceConf(final SpaceConfEvent event) { - final Space space = event.getSpace(); - final String token = event.getToken(); - switch (space) { - case homeSpace: - homeToken = token; - break; - case userSpace: - userToken = token; - break; - case groupSpace: - groupToken = token; - break; - case publicSpace: - publicToken = token; - break; - } - } - - @ProxyEvent - public void onSpaceSelect(final SpaceSelectEvent event) { - final Space space = event.getSpace(); - if (space != currentSpace) { - final boolean restoreToken = event.shouldRestoreToken(); - switch (space) { - case homeSpace: - onHomeSpaceSelect(restoreToken); - break; - case userSpace: - onUserSpaceSelect(restoreToken); - break; - case groupSpace: - onGroupSpaceSelect(restoreToken); - break; - case publicSpace: - onPublicSpaceSelect(restoreToken); - break; - default: - break; - } - } - } - - @ProxyEvent - public void onUserSignOut(final UserSignOutEvent event) { - if (currentSpace == Space.userSpace) { - restoreToken(homeToken); - } - userToken = SiteTokens.WAVEINBOX; - } - - private void onUserSpaceSelect(final boolean shouldRestoreToken) { - if (session.isLogged()) { - restoreToken(shouldRestoreToken, userToken); - armor.selectUserSpace(); - backManager.clearBackImage(); - setDown(Space.userSpace); - currentSpace = Space.userSpace; - } else { - signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"), - NotifyLevel.info); - stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken)); - getView().setUserBtnDown(false); - } - } - - private void restoreToken(final boolean shouldRestoreToken, final String token) { - if (shouldRestoreToken) { - restoreToken(token); - } - } - - private void restoreToken(final String token) { - stateManager.gotoHistoryToken(token); - } - - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } - - private void setDown(final Space space) { - getView().setHomeBtnDown(space.equals(Space.homeSpace)); - getView().setUserBtnDown(space.equals(Space.userSpace)); - getView().setGroupBtnDown(space.equals(Space.groupSpace)); - getView().setPublicBtnDown(space.equals(Space.publicSpace)); - } - - private void showTooltipNow() { - if (currentSpace != null) { - switch (currentSpace) { - case homeSpace: - getView().showHomeSpaceTooltip(); - break; - case userSpace: - getView().showUserSpaceTooltip(); - break; - case groupSpace: - getView().showGroupSpaceTooltip(); - break; - case publicSpace: - getView().showPublicSpaceTooltip(); - break; - } - } - } - - protected void showTooltipWithDelay() { - new Timer() { - @Override - public void run() { - showTooltipNow(); - } - }.schedule(200); - } -} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -0,0 +1,302 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.sitebar.spaces; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.core.client.auth.SignIn; +import cc.kune.core.client.events.WindowFocusEvent; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.TokenUtils; +import cc.kune.core.client.state.UserSignOutEvent; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.GSpaceArmor; +import cc.kune.gspace.client.style.GSpaceBackManager; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.Timer; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; + +public class SpaceSelectorPresenter extends + Presenter<SpaceSelectorPresenter.SpaceSelectorView, SpaceSelectorPresenter.SpaceSelectorProxy> { + + @ProxyCodeSplit + public interface SpaceSelectorProxy extends Proxy<SpaceSelectorPresenter> { + } + + public interface SpaceSelectorView extends View { + + public static String GROUP_SPACE_ID = "k-space-group-id"; + public static String HOME_SPACE_ID = "k-space-home-id"; + public static String PUBLIC_SPACE_ID = "k-space-public-id"; + public static String USER_SPACE_ID = "k-space-user-id"; + + HasClickHandlers getGroupBtn(); + + HasClickHandlers getHomeBtn(); + + HasClickHandlers getPublicBtn(); + + HasClickHandlers getUserBtn(); + + void setGroupBtnDown(boolean down); + + void setHomeBtnDown(boolean down); + + void setPublicBtnDown(boolean down); + + void setUserBtnDown(boolean down); + + void showGroupSpaceTooltip(); + + void showHomeSpaceTooltip(); + + void showPublicSpaceTooltip(); + + void showUserSpaceTooltip(); + } + + private final GSpaceArmor armor; + private final GSpaceBackManager backManager; + private Space currentSpace; + private String groupToken; + private String homeToken; + private final I18nTranslationService i18n; + private String publicToken; + private final Session session; + private final Provider<SignIn> signIn; + private final StateManager stateManager; + private String userToken; + + @Inject + public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, + final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, + final Session session, final Provider<SignIn> signIn, final GSpaceBackManager backManager, + final I18nTranslationService i18n, final MaskWidgetView mask) { + super(eventBus, view, proxy); + this.stateManager = stateManager; + this.armor = armor; + this.session = session; + this.signIn = signIn; + this.backManager = backManager; + this.i18n = i18n; + currentSpace = null; + homeToken = SiteTokens.HOME; + userToken = SiteTokens.WAVEINBOX; + groupToken = SiteTokens.GROUP_HOME; + publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME); + view.getHomeBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + restoreToken(homeToken); + setDown(Space.homeSpace); + } + }); + view.getUserBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + restoreToken(userToken); + setDown(Space.userSpace); + } + }); + view.getGroupBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + restoreToken(groupToken); + setDown(Space.groupSpace); + } + }); + view.getPublicBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + restoreToken(publicToken); + setDown(Space.publicSpace); + } + + }); + eventBus.addHandler(WindowFocusEvent.getType(), new WindowFocusEvent.WindowFocusHandler() { + @Override + public void onWindowFocus(final WindowFocusEvent event) { + if (event.isHasFocus() && !mask.isShowing()) { + // showTooltipWithDelay(); + } + } + }); + } + + @ProxyEvent + public void onAppStart(final AppStartEvent event) { + // showTooltipWithDelay(); + } + + private void onGroupSpaceSelect(final boolean shouldRestoreToken) { + restoreToken(shouldRestoreToken, groupToken); + armor.selectGroupSpace(); + backManager.restoreBackImage(); + setDown(Space.groupSpace); + currentSpace = Space.groupSpace; + } + + private void onHomeSpaceSelect(final boolean shouldRestoreToken) { + restoreToken(shouldRestoreToken, homeToken); + armor.selectHomeSpace(); + backManager.clearBackImage(); + setDown(Space.homeSpace); + currentSpace = Space.homeSpace; + } + + private void onPublicSpaceSelect(final boolean shouldRestoreToken) { + restoreToken(shouldRestoreToken, userToken); + armor.selectPublicSpace(); + backManager.restoreBackImage(); + setDown(Space.publicSpace); + currentSpace = Space.publicSpace; + } + + @ProxyEvent + public void onSpaceConf(final SpaceConfEvent event) { + final Space space = event.getSpace(); + final String token = event.getToken(); + switch (space) { + case homeSpace: + homeToken = token; + break; + case userSpace: + userToken = token; + break; + case groupSpace: + groupToken = token; + break; + case publicSpace: + publicToken = token; + break; + } + } + + @ProxyEvent + public void onSpaceSelect(final SpaceSelectEvent event) { + final Space space = event.getSpace(); + if (space != currentSpace) { + final boolean restoreToken = event.shouldRestoreToken(); + switch (space) { + case homeSpace: + onHomeSpaceSelect(restoreToken); + break; + case userSpace: + onUserSpaceSelect(restoreToken); + break; + case groupSpace: + onGroupSpaceSelect(restoreToken); + break; + case publicSpace: + onPublicSpaceSelect(restoreToken); + break; + default: + break; + } + } + } + + @ProxyEvent + public void onUserSignOut(final UserSignOutEvent event) { + if (currentSpace == Space.userSpace) { + restoreToken(homeToken); + } + userToken = SiteTokens.WAVEINBOX; + } + + private void onUserSpaceSelect(final boolean shouldRestoreToken) { + if (session.isLogged()) { + restoreToken(shouldRestoreToken, userToken); + armor.selectUserSpace(); + backManager.clearBackImage(); + setDown(Space.userSpace); + currentSpace = Space.userSpace; + } else { + signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"), + NotifyLevel.info); + stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken)); + getView().setUserBtnDown(false); + } + } + + private void restoreToken(final boolean shouldRestoreToken, final String token) { + if (shouldRestoreToken) { + restoreToken(token); + } + } + + private void restoreToken(final String token) { + stateManager.gotoHistoryToken(token); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + private void setDown(final Space space) { + getView().setHomeBtnDown(space.equals(Space.homeSpace)); + getView().setUserBtnDown(space.equals(Space.userSpace)); + getView().setGroupBtnDown(space.equals(Space.groupSpace)); + getView().setPublicBtnDown(space.equals(Space.publicSpace)); + } + + private void showTooltipNow() { + if (currentSpace != null) { + switch (currentSpace) { + case homeSpace: + getView().showHomeSpaceTooltip(); + break; + case userSpace: + getView().showUserSpaceTooltip(); + break; + case groupSpace: + getView().showGroupSpaceTooltip(); + break; + case publicSpace: + getView().showPublicSpaceTooltip(); + break; + } + } + } + + protected void showTooltipWithDelay() { + new Timer() { + @Override + public void run() { + showTooltipNow(); + } + }.schedule(200); + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -47,8 +47,8 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.info(i18n.t("Search the user you want to add and in his/her homepage press '" - + CoreMessages.ADD_AS_A_BUDDIE + "'")); + NotifyUser.info(i18n.t("Search the user you want to add and in his/her homepage click '" + + CoreMessages.ADD_AS_A_BUDDY + "'")); searcher.get().focus(); } Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -1,73 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.sn.actions; - -import cc.kune.chat.client.ChatClient; -import cc.kune.common.client.actions.AbstractAction; -import cc.kune.common.client.actions.PropertyChangeEvent; -import cc.kune.common.client.actions.PropertyChangeListener; -import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateChangedEvent; -import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.ws.entheader.EntityHeader; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; - -import com.google.inject.Inject; - -public class WriteToBuddieHeaderButton { - - @Inject - public WriteToBuddieHeaderButton(final WriteToAction writeToAction, final EntityHeader entityHeader, - final StateManager stateManager, final Session session, final ChatClient chatEngine) { - final ButtonDescriptor button = new ButtonDescriptor(writeToAction); - // button.setVisible(false); - button.withText("Write to your buddie"); - // button.setStyles("k-chat-add-as-buddie"); - writeToAction.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(AbstractAction.ENABLED)) { - button.setVisible((Boolean) event.getNewValue()); - } - } - }); - entityHeader.addAction(button); - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - final StateAbstractDTO state = event.getState(); - final GroupDTO group = state.getGroup(); - final String groupName = group.getShortName(); - final boolean imLogged = session.isLogged(); - final boolean isBuddie = chatEngine.isBuddie(groupName); - if (imLogged && group.isPersonal() && isBuddie - && !session.getCurrentUser().getShortName().equals(groupName)) { - button.setTarget(group); - writeToAction.setEnabled(true); - } else { - writeToAction.setEnabled(false); - } - } - }); - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java (from rev 1538, trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -0,0 +1,73 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.sn.actions; + +import cc.kune.chat.client.ChatClient; +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.PropertyChangeEvent; +import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; + +import com.google.inject.Inject; + +public class WriteToBuddyHeaderButton { + + @Inject + public WriteToBuddyHeaderButton(final WriteToAction writeToAction, final EntityHeader entityHeader, + final StateManager stateManager, final Session session, final ChatClient chatEngine) { + final ButtonDescriptor button = new ButtonDescriptor(writeToAction); + // button.setVisible(false); + button.withText("Write to your buddy"); + // button.setStyles("k-chat-add-as-buddie"); + writeToAction.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(AbstractAction.ENABLED)) { + button.setVisible((Boolean) event.getNewValue()); + } + } + }); + entityHeader.addAction(button); + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + final StateAbstractDTO state = event.getState(); + final GroupDTO group = state.getGroup(); + final String groupName = group.getShortName(); + final boolean imLogged = session.isLogged(); + final boolean isBuddie = chatEngine.isBuddy(groupName); + if (imLogged && group.isPersonal() && isBuddie + && !session.getCurrentUser().getShortName().equals(groupName)) { + button.setTarget(group); + writeToAction.setEnabled(true); + } else { + writeToAction.setEnabled(false); + } + } + }); + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -46,8 +46,7 @@ @Inject public GroupSNAdminsMenuItemsRegistry(final Session session, final I18nTranslationService i18n, - final IsLoggedCondition isLogged, - final IsCurrentStateAdministrableCondition isAdministrable, + final IsLoggedCondition isLogged, final IsCurrentStateAdministrableCondition isAdministrable, final IsPersonCondition isPerson, final IsGroupCondition isGroup, final IsBuddieCondition isBuddie, final IsMeCondition isMe, final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, @@ -78,7 +77,7 @@ public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(writeToAction); item.add(isPerson); - item.withText(i18n.t("Write to your buddie")); + item.withText(i18n.t("Write to your buddy")); item.add(isNotMe); item.add(isBuddie); item.add(isLogged); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -76,7 +76,7 @@ public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(writeToAction); item.add(isPersonCondition); - item.withText(i18n.t("Write to your buddie")); + item.withText(i18n.t("Write to your buddy")); item.add(isNotMe); item.add(isBuddie); item.add(isLogged); Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -117,6 +117,8 @@ boolean getShowDeletedContent(); + String getSiteCommonName(); + String getSiteUrl(); Object[][] getTimezones(); Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -215,6 +215,10 @@ return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); } + public String getSiteCommonName() { + return getInitData().getSiteCommonName(); + } + @Override public String getSiteUrl() { final String baseURL = GWT.getModuleBaseURL(); Modified: trunk/src/main/java/cc/kune/core/server/InitData.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/InitData.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/server/InitData.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -57,6 +57,7 @@ private String mp3EmbedObject; private String oggEmbedObject; private ReservedWordsRegistryDTO reservedWords; + private String siteCommonName; private String siteDomain; private String siteLogoUrl; private String siteShortName; @@ -157,6 +158,10 @@ return this.reservedWords; } + public String getSiteCommonName() { + return siteCommonName; + } + @Deprecated public String getSiteDomain() { return siteDomain; @@ -286,6 +291,10 @@ this.reservedWords = reservedWords; } + public void setSiteCommonName(final String siteCommonName) { + this.siteCommonName = siteCommonName; + } + @Deprecated public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -243,9 +243,9 @@ roster = xmppManager.getRoster(connection); xmppManager.disconnect(connection); } catch (final ChatException e) { - // Seems that it not possible to get the buddy list, then we follow + // Seems that it not possible to get the buddies list, then we follow // with a empty buddy list - log.error("Cannot retrieve the buddie list", e); + log.error("Cannot retrieve the buddies list", e); roster = new HashSet<RosterEntry>(); } for (final RosterEntry entry : roster) { @@ -291,10 +291,11 @@ public void run() { xmppManager.sendMessage( userName, - i18n.t("This is the chat window. " - + "" - + "Here you can communicate with other users of this site but also with other users with compatible accounts (like gmail accounts). " - + "" + "Just add some buddie and start to chat.")); + i18n.t( + "This is the chat window. " + + "Here you can communicate with other users of [%s] but also with other users with compatible accounts (like gmail accounts). " + + "Just add some buddy and start to chat.", + i18n.t(properties.getSiteCommonName()))); } }, 5000); } Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -62,6 +62,10 @@ return properties.get(KuneProperties.SITE_SHORTNAME); } + public String getSiteCommonName() { + return properties.get(KuneProperties.SITE_COMMON_NAME); + } + public String getWelcomewave() { return properties.get(KuneProperties.WELCOME_WAVE); } Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -42,6 +42,7 @@ String SITE_ADMIN_NAME = "kune.admin.name"; String SITE_ADMIN_PASSWD = "kune.admin.password"; String SITE_ADMIN_SHORTNAME = "kune.admin.shortName"; + String SITE_COMMON_NAME = "kune.default.site.commonname"; String SITE_DEF_LICENSE = "kune.default.license"; String SITE_DOMAIN = "kune.site.domain"; String SITE_GROUP_AVAILABLE_TOOLS = "kune.tools.groupSiteAvailableTools"; Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -148,6 +148,7 @@ data.setExtMediaDescrips(extMediaDescManager.getAll()); data.setFeedbackEnabled(kuneProperties.getBoolean(KuneProperties.FEEDBACK_ENABLED)); data.setSiteShortName(kuneProperties.get(KuneProperties.SITE_SHORTNAME)); + data.setSiteCommonName(kuneProperties.get(KuneProperties.SITE_COMMON_NAME)); return data; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -50,6 +50,7 @@ private String mp3EmbedObject; private String oggEmbedObject; private ReservedWordsRegistryDTO reservedWords; + private String siteCommonName; private String siteDomain; private String siteLogoUrl; private String siteShortName; @@ -153,6 +154,10 @@ return this.reservedWords; } + public String getSiteCommonName() { + return siteCommonName; + } + @Deprecated public String getSiteDomain() { return siteDomain; @@ -286,6 +291,10 @@ this.reservedWords = reservedWords; } + public void setSiteCommonName(final String siteCommonName) { + this.siteCommonName = siteCommonName; + } + @Deprecated public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -22,7 +22,7 @@ import cc.kune.common.client.ExtendedGinModule; import cc.kune.core.client.sitebar.search.SitebarSearchPanel; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; -import cc.kune.core.client.sn.actions.WriteToBuddieHeaderButton; +import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import cc.kune.gspace.client.actions.GiveUsFeedbackBtn; import cc.kune.gspace.client.actions.RenameAction; @@ -187,7 +187,7 @@ s(ContentViewerOptionsMenu.class); s(RenameAction.class); s(GiveUsFeedbackBtn.class); - s(WriteToBuddieHeaderButton.class); + s(WriteToBuddyHeaderButton.class); // LicenseWizard bindPresenter(LicenseWizardPresenter.class, LicenseWizardView.class, LicenseWizardPanel.class, Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-10-04 00:46:24 UTC (rev 1543) @@ -22,7 +22,7 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; -import cc.kune.core.client.sn.actions.WriteToBuddieHeaderButton; +import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GiveUsFeedbackBtn; import cc.kune.gspace.client.i18n.I18nToTranslateGridPanel; @@ -72,7 +72,7 @@ final Provider<GiveUsFeedbackBtn> giveUsFeedback, final Provider<I18nToTranslateGridPanel> toTrans, final Provider<I18nTranslatorTabsCollection> gtranslator, - final Provider<WriteToBuddieHeaderButton> writeToBuddie) { + final Provider<WriteToBuddyHeaderButton> writeToBuddie) { session.onAppStart(true, new AppStartHandler() { @Override Modified: trunk/src/main/resources/db/liquibase_changelog.xml =================================================================== --- trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-04 00:46:24 UTC (rev 1543) @@ -151,7 +151,7 @@ </changeSet> <changeSet id="23" author="vjrj"> <comment>I18n translations cleanup 3</comment> - <sqlFile path="src/main/resources/db/update-0017-i18nclean3.sql" + <sqlFile path="src/main/resources/db/update-0018-i18nclean3.sql" encoding="utf8" stripComments="1" /> <rollback>SELECT * FROM globalize_countries;</rollback> </changeSet> Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-10-03 23:19:58 UTC (rev 1542) +++ trunk/src/main/resources/kune.properties 2011-10-04 00:46:24 UTC (rev 1543) @@ -12,6 +12,11 @@ kune.default.site.shortName = site kune.site.domain = localhost +# In the client UI we will use this string for mention this site in messages +# like: "Thanks for joining this site" +# Your can use another string and the message will looks like "Thanks for joining example.org" +kune.default.site.commonname = this site + # Email kune.site.smtp.host = localhost kune.site.smtp.defaultfrom = noreply@localhost