Skip to content

Commit a2f093d

Browse files
fixing bug #13225
1 parent a464cf2 commit a2f093d

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ processManager.csvExport = Exporter au format CSV
111111
processManager.multipleWindowDetected = Le syst\u00e8me a d\u00e9tect\u00e9 que vous naviguiez depuis plusieurs fen\u00eatres partageant la m\u00eame session. <br>Ce mode d'utilisation est proscrit : il peut amener \u00e0 de nombreux dysfonctionnements. <br>Si toutefois ce n'est pas le cas, merci de vous d\u00e9connecter et de vous reconnecter.
112112
processManager.since = depuis le
113113
processManager.removeLock = Supprimer
114-
processManager.createProcess.feedback=Votre demande a bien \u00e9t\u00e9 enregistr\u00e9e. Si elle n'appara\u00eet pas, vous pouvez <a href="listProcess">rafra\u00eechir la liste</a>.
114+
processManager.createProcess.feedback=Votre demande a bien \u00e9t\u00e9 enregistr\u00e9e. Si elle n''appara\u00eet pas, vous pouvez <a href=''{0}''>rafra\u00eechir la liste</a>.
115115
processManager.action.feedback=Votre action a bien \u00e9t\u00e9 enregistr\u00e9e.
116116
processManager.replacements.manage = G\u00e9rer les remplacements
117117
processManager.replacements.none = Aucun remplacement
@@ -132,4 +132,4 @@ processManager.replacements.forRoles=Pour les r\u00f4les
132132
processManager.replacements.roles.filter.label=Ayant les r\u00f4les
133133
processManager.replacements.replacing=en remplacement de
134134
processManager.replacements.incumbent.overview=Vous avez {0} {0,choice, 1#remplacement actif ou programm\u00e9| 1<remplacements actifs ou programm\u00e9s}.
135-
processManager.replacements.process.replacement=En tant que rempla\u00e7ant, vous agissez pour le compte de <b>{0}</b> avec son r\u00f4le de <b>{1}</b>.
135+
processManager.replacements.process.replacement=En tant que rempla\u00e7ant, vous agissez pour le compte de <b>{0}</b> avec son r\u00f4le de <b>{1}</b>.

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_de.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ processManager.csvExport = Exporter au format CSV
112112
processManager.multipleWindowDetected = Das System hat festgestellt, dass Sie mehrere Fenster f&uuml;r die selbe Sitzung verwenden. <br>Diese Nutzung ist verboten und kann gr&ouml;ssere Probleme verursachen. Falls es nicht der Fall ist, <br>melden Sie sich bitte ab und dann wieder an.
113113
processManager.since = Seit
114114
processManager.removeLock = L\u00f6schen
115-
processManager.createProcess.feedback=Your request has been registered. If it does not appear, you can <a href\="listProcess">refresh the list</a>.
115+
processManager.createProcess.feedback=Your request has been registered. If it does not appear, you can <a href=''{0}''>refresh the list</a>.
116116
processManager.action.feedback=Your request has been processed.
117117
processManager.replacements.manage = Manage replacements
118118
processManager.replacements.none = No replacement
@@ -133,4 +133,4 @@ processManager.replacements.forRoles=About roles
133133
processManager.replacements.roles.filter.label=Filter on profiles
134134
processManager.replacements.replacing=ersetzt
135135
processManager.replacements.incumbent.overview=Sie haben {0} aktive oder programmierte Ersetzungen.
136-
processManager.replacements.process.replacement=Als Stellvertreter handeln Sie im Namen von <b>{0}</b> mit der Rolle <b>{1}</b>.
136+
processManager.replacements.process.replacement=Als Stellvertreter handeln Sie im Namen von <b>{0}</b> mit der Rolle <b>{1}</b>.

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_en.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ processManager.multipleWindowDetected = system has detected that you use several
112112
processManager.since = since
113113
processManager.removeLock = Remove
114114

115-
processManager.createProcess.feedback=Your request has been registered. If it does not appear, you can <a href\="listProcess">refresh the list</a>.
115+
processManager.createProcess.feedback=Your request has been registered. If it does not appear, you can <a href=''{0}''>refresh the list</a>.
116116
processManager.action.feedback=Your request has been processed.
117117
processManager.replacements.manage = Manage replacements
118118
processManager.replacements.none = No replacement
@@ -133,4 +133,4 @@ processManager.replacements.forRoles=About roles
133133
processManager.replacements.roles.filter.label=Filter on profiles
134134
processManager.replacements.replacing=replacing
135135
processManager.replacements.incumbent.overview=You have {0} active or scheduled {0,choice, 1#replacement| 1<replacements}.
136-
processManager.replacements.process.replacement=As a substitute, you act on behalf of <b>{0}</b> with its role of <b>{1}</b>.
136+
processManager.replacements.process.replacement=As a substitute, you act on behalf of <b>{0}</b> with its role of <b>{1}</b>.

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_fr.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ processManager.multipleWindowDetected = Le syst\u00e8me a d\u00e9tect\u00e9 que
112112
processManager.since = depuis le
113113
processManager.removeLock = Supprimer
114114

115-
processManager.createProcess.feedback=Votre demande a bien \u00e9t\u00e9 enregistr\u00e9e. Si elle n'appara\u00eet pas, vous pouvez <a href\="listProcess">rafra\u00eechir la liste</a>.
115+
processManager.createProcess.feedback=Votre demande a bien \u00e9t\u00e9 enregistr\u00e9e. Si elle n''appara\u00eet pas, vous pouvez <a href=''{0}''>rafra\u00eechir la liste</a>.
116116
processManager.action.feedback=Votre action a bien \u00e9t\u00e9 enregistr\u00e9e.
117117
processManager.replacements.manage = G\u00e9rer les remplacements
118118
processManager.replacements.none = Aucun remplacement
@@ -133,4 +133,4 @@ processManager.replacements.forRoles = Pour les r\u00f4les
133133
processManager.replacements.roles.filter.label = Ayant les r\u00f4les
134134
processManager.replacements.replacing=en remplacement de
135135
processManager.replacements.incumbent.overview=Vous avez {0} {0,choice, 1#remplacement actif ou programm\u00e9| 1<remplacements actifs ou programm\u00e9s}.
136-
processManager.replacements.process.replacement=En tant que rempla\u00e7ant, vous agissez pour le compte de <b>{0}</b> avec son r\u00f4le de <b>{1}</b>.
136+
processManager.replacements.process.replacement=En tant que rempla\u00e7ant, vous agissez pour le compte de <b>{0}</b> avec son r\u00f4le de <b>{1}</b>.

processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.silverpeas.core.util.MapUtil;
4646
import org.silverpeas.core.util.Mutable;
4747
import org.silverpeas.core.util.StringUtil;
48+
import org.silverpeas.core.util.URLUtil;
4849
import org.silverpeas.core.util.csv.CSVRow;
4950
import org.silverpeas.core.util.logging.SilverLogger;
5051
import org.silverpeas.core.web.export.ExportCSVBuilder;
@@ -1063,7 +1064,8 @@ public String createProcessInstance(DataRecord data, boolean isDraft, boolean fi
10631064
Workflow.getWorkflowEngine().process((TaskSavedEvent) event);
10641065
} else {
10651066
Workflow.getWorkflowEngine().process((TaskDoneEvent) event);
1066-
feedbackUser("processManager.createProcess.feedback");
1067+
feedbackUser("processManager.createProcess.feedback",
1068+
URLUtil.getSimpleURL(URLUtil.URL_COMPONENT, getComponentId()));
10671069
}
10681070

10691071
return event.getProcessInstance().getInstanceId();
@@ -1080,7 +1082,12 @@ private void setSubstituteToEvent(GenericEvent event) {
10801082
}
10811083

10821084
private void feedbackUser(String key) {
1083-
MessageNotifier.addSuccess(getString(key)).setDisplayLiveTime(10000);
1085+
feedbackUser(key, null);
1086+
}
1087+
1088+
private void feedbackUser(String key, String param) {
1089+
MessageNotifier.addSuccess(getMultilang().getStringWithParams(key, param))
1090+
.setDisplayLiveTime(10000);
10841091
}
10851092

10861093
private void doAPause() {

0 commit comments

Comments
 (0)