From 44de669bbc18b032179940acc4588f62ed0907e5 Mon Sep 17 00:00:00 2001 From: Vadim Date: Tue, 3 Apr 2018 12:04:30 +0300 Subject: [PATCH 1/2] Update section with providing URL to the application --- HACKING.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HACKING.rst b/HACKING.rst index 7dda00b8b..04bb5635e 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -595,3 +595,5 @@ For MySQL users here are specific instructions. $ cd libreplan-webapp/ $ mvn -Pdev,mysql jetty:run + +* Go to http://localhost:8080/libreplan-webapp/ From 5b251b4aeab1c7e0e5d3dc3ca90610c54eb96f02 Mon Sep 17 00:00:00 2001 From: Vadim Date: Mon, 18 Jun 2018 15:46:19 +0300 Subject: [PATCH 2/2] #1802: fix issue with wrong string --- libreplan-webapp/src/main/resources/i18n/keys.pot | 2 +- libreplan-webapp/src/main/resources/i18n/zh.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index 6cc02d7d7..bcb821740 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -4784,7 +4784,7 @@ msgid "Connect" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1240 -msgid "This progress type cannot cannot be removed" +msgid "This progress type cannot be removed" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 diff --git a/libreplan-webapp/src/main/resources/i18n/zh.po b/libreplan-webapp/src/main/resources/i18n/zh.po index c7c8eb9ab..957c5df05 100644 --- a/libreplan-webapp/src/main/resources/i18n/zh.po +++ b/libreplan-webapp/src/main/resources/i18n/zh.po @@ -4395,7 +4395,7 @@ msgid "Connect" msgstr "连" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1240 -msgid "This progress type cannot cannot be removed" +msgid "This progress type cannot be removed" msgstr "这一进展类型不能不能被删除" #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:145