Index: lutinutil/src/java/org/codelutin/vcs/VCSAction.java diff -u lutinutil/src/java/org/codelutin/vcs/VCSAction.java:1.2 lutinutil/src/java/org/codelutin/vcs/VCSAction.java:1.3 --- lutinutil/src/java/org/codelutin/vcs/VCSAction.java:1.2 Tue Mar 18 18:18:36 2008 +++ lutinutil/src/java/org/codelutin/vcs/VCSAction.java Sat Mar 22 23:23:37 2008 @@ -20,6 +20,7 @@ package org.codelutin.vcs; import static org.codelutin.i18n.I18n._; +import static org.codelutin.i18n.I18n.n_; /** * a VCSAction represents an action that can be realized on a file in working @@ -39,23 +40,23 @@ public enum VCSAction { /** to add an unversionned file on repository */ - ADD(_("lutinutil.vcs.action.add"), true, false, true, true), + ADD(n_("lutinutil.vcs.action.add"), true, false, true, true), /** to delete locally and from repository */ - DELETE(_("lutinutil.vcs.action.delete"), true, true, true, true), + DELETE(n_("lutinutil.vcs.action.delete"), true, true, true, true), /** to get another version from repository */ - UPDATE(_("lutinutil.vcs.action.update"), true, true, false, false), + UPDATE(n_("lutinutil.vcs.action.update"), true, true, false, false), /** to get a clean copy from repository */ - OVERWRITE_AND_UPDATE(_("lutinutil.vcs.action.overwriteAndUpdate"), true, true, false, false), + OVERWRITE_AND_UPDATE(n_("lutinutil.vcs.action.overwriteAndUpdate"), true, true, false, false), /** commit a modification to repository */ - COMMIT(_("lutinutil.vcs.action.commit"), true, false, true, true), + COMMIT(n_("lutinutil.vcs.action.commit"), true, false, true, true), /** to rollback to working base revision */ - REVERT(_("lutinutil.vcs.action.revert"), true, true, false, false), + REVERT(n_("lutinutil.vcs.action.revert"), true, true, false, false), /** to acquire a file from repository */ - CHECKOUT(_("lutinutil.vcs.action.checkout"), true, false, false, false), + CHECKOUT(n_("lutinutil.vcs.action.checkout"), true, false, false, false), /** to obtain the changelog of a file */ - CHANGELOG(_("lutinutil.vcs.action.changeLog"), false, false, false, false), + CHANGELOG(n_("lutinutil.vcs.action.changeLog"), false, false, false, false), /** to obtain diif */ - DIFF(_("lutinutil.vcs.action.diff"), false, false, false, false); + DIFF(n_("lutinutil.vcs.action.diff"), false, false, false, false); /** libelle of the action */ private final String libelle; @@ -74,7 +75,7 @@ } public String getLibelle() { - return libelle; + return _(libelle); } public boolean isVisible() { Index: lutinutil/src/java/org/codelutin/vcs/VCSState.java diff -u lutinutil/src/java/org/codelutin/vcs/VCSState.java:1.2 lutinutil/src/java/org/codelutin/vcs/VCSState.java:1.3 --- lutinutil/src/java/org/codelutin/vcs/VCSState.java:1.2 Tue Mar 18 18:18:36 2008 +++ lutinutil/src/java/org/codelutin/vcs/VCSState.java Sat Mar 22 23:23:37 2008 @@ -1,6 +1,6 @@ package org.codelutin.vcs; -import org.codelutin.i18n.I18n; +import static org.codelutin.i18n.I18n.n_;import static org.codelutin.i18n.I18n._; import static org.codelutin.vcs.VCSAction.ADD; import static org.codelutin.vcs.VCSAction.CHANGELOG; import static org.codelutin.vcs.VCSAction.COMMIT; @@ -24,7 +24,7 @@ *
* The only action for this state is to delete the file, nothing else. */ - UP_TO_DATE("uptodate", I18n._("lutinutil.vcs.state.uptodate"), DELETE), + UP_TO_DATE("uptodate", n_("lutinutil.vcs.state.uptodate"), DELETE), /** * when a local file matches a remote copy but not the latest one. @@ -36,7 +36,7 @@ *
  • {@link VCSAction#CHANGELOG}
  • * */ - OUT_OF_DATE("outofdate", I18n._("lutinutil.vcs.state.outofdate"), + OUT_OF_DATE("outofdate", n_("lutinutil.vcs.state.outofdate"), UPDATE, DIFF, CHANGELOG), /** @@ -50,7 +50,7 @@ *
  • {@link VCSAction#DIFF}
  • * */ - MODIFIED("modified", I18n._("lutinutil.vcs.state.modified"), + MODIFIED("modified", n_("lutinutil.vcs.state.modified"), COMMIT, OVERWRITE_AND_UPDATE, REVERT, DIFF), /** @@ -66,7 +66,7 @@ * */ OUT_OF_DATE_AND_MODIFIED("outofdateAndModified", - I18n._("lutinutil.vcs.state.outofdateAndModified"), + n_("lutinutil.vcs.state.outofdateAndModified"), OVERWRITE_AND_UPDATE, REVERT, DIFF, CHANGELOG), /** @@ -76,7 +76,7 @@ *
  • {@link VCSAction#ADD}
  • * */ - UNVERSIONNED("unversionned", I18n._("lutinutil.vcs.state.unversionned"), ADD), + UNVERSIONNED("unversionned", n_("lutinutil.vcs.state.unversionned"), ADD), /** * when a file exists on remote repository but not locally. @@ -85,7 +85,7 @@ *
  • {@link VCSAction#UPDATE}
  • * */ - MISSING("missing", I18n._("lutinutil.vcs.state.missing"), UPDATE), + MISSING("missing", n_("lutinutil.vcs.state.missing"), UPDATE), /** * when a file is unversionned or missing : this special and durty state @@ -102,10 +102,10 @@ * */ UNVERSIONNED_OR_MISSING("unversionnedOrMissing", - I18n._("lutinutil.vcs.state.unversionnedOrMissing"), ADD, UPDATE), + n_("lutinutil.vcs.state.unversionnedOrMissing"), ADD, UPDATE), /** to deal with other cases (...) */ - UNKNOWN("unknown", I18n._("lutinutil.vcs.state.unknown")); + UNKNOWN("unknown", n_("lutinutil.vcs.state.unknown")); /** libelle to be used */ private final String libelle; @@ -122,7 +122,7 @@ } public String libelle() { - return libelle; + return _(libelle); } public VCSAction[] getActions() {