Merge branch 'main' into update-several-translations

.github/workflows/ubuntu-20.04.yml

@@ -5,9 +5,9 @@ name: Ubuntu 20.04 (Focal Fossa)
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   build:

.github/workflows/ubuntu-22.04.yml

@@ -5,9 +5,9 @@ name: Ubuntu 22.04 (Jammy Jellyfish)
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   build:

.github/workflows/ubuntu-24.04.yml

@@ -5,9 +5,9 @@ name: Ubuntu 24.04 (Noble Numbat)
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   build:

.gitignore

@@ -10,6 +10,9 @@ ganttzk/target
 .project
 .settings/
 
+# ignore VSCode configuration files
+.vscode
+
 # ignore Intellij IDEA configuration files
 .idea
 *.iml

.well-known/funding-manifest-urls

@@ -0,0 +1 @@
+https://libreplan.dev/funding.json

ganttzk/src/main/resources/i18n/keys.pot

@@ -1,262 +1,266 @@
-# LibrePlan - GanttZK module.
+# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-#                         Desenvolvemento Tecnolóxico de Galicia
+# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) 2010-2013 Igalia, S.L.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# This file is distributed under the same license as the LibrePlan package.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libreplan-1.6.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 12:09+0200\n"
+"POT-Creation-Date: 2024-11-23 14:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:216
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:510
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:235
-msgid "Erase"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299
-msgid "Add Dependency"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
-msgid "Worker"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:686
-msgid "Show money cost bar"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
-msgid "Start"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:665
-msgid "Show reported hours"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85
-msgid "Show/Hide reported hours"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-msgid "Zoom"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67
-msgid "The specified dependency is not allowed"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:255
-msgid "Set End-End"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
-msgid "Show/Hide progress"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
-msgid "Task"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199
-msgid "available effort: {0}, assigned effort: {1}"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64
-msgid "Criterion"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:692
-msgid "Hide money cost bar"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44
-msgid "Print"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
-msgid "Week"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501
 msgid "filtering by name"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:474
-msgid "See scheduling"
+msgid "All"
+msgstr ""
+
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Project"
+msgstr ""
+
+#: org/zkoss/ganttz/TaskList.java:298
+msgid "Add Dependency"
+msgstr ""
+
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:59
+msgid "Task"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:648
+msgid "Hide critical path"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:102
+msgid "Show/Hide money cost bar"
+msgstr ""
+
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:273
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:280
+msgid "and no later than"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:192
+msgid "available effort: {0}, assigned effort: {1}"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:138
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:103
+msgid "Graphics"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:213
+#: org/zkoss/ganttz/DependencyList.java:228
+msgid "Erase"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:475
+msgid "Show all elements"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184
+msgid "Load: {0}%"
+msgstr ""
+
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:82
+msgid "Day"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:88
+msgid "Generic allocation criteria"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:693
+msgid "Show reported hours"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:344
+msgid "decreasing zoom"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:670
+msgid "Show progress"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:147
+msgid "See resource allocation"
+msgstr ""
+
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:65
+msgid "Criterion"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:81
+msgid "Flatten/Unflatten tree"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:326
+msgid "increasing zoom"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:31
+msgid "T / M"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
+msgid "Print"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:88
+msgid "Show/Hide progress"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:717
+msgid "Hide money cost bar"
+msgstr ""
+
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
+msgid "Month"
 msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30
 msgid "End"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:96
-msgid "Resources"
+msgid "Show/Hide reported hours"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
+#: org/zkoss/ganttz/Planner.java:712
-msgid "changing zoom"
+msgid "Show money cost bar"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:47
+#: org/zkoss/ganttz/DependencyList.java:66
-msgid "Group by"
+msgid "The specified dependency is not allowed"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:91
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57
-msgid "Show/Hide money cost bar"
+msgid "Worker"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90
-msgid "Generic allocation criteria"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
-msgid "Quarter"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43
-msgid "Page"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
-msgid "None"
 msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
-msgid "Flatten/Unflatten tree"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
-msgid "Project"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67
-msgid "Name"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:642
-msgid "Show progress"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
-msgid "Expand/Collapse all"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
-msgid "Show/Hide critical path"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
-msgid "Year"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150
-msgid "showing criteria"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
-msgid "Month"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
 msgid "Show/Hide resources"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:247
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
-msgid "Set End-Start"
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:77
+msgid "Name"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:306
+#: org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:170
-msgid "decreasing zoom"
+msgid "See scheduling"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:622
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:159
-msgid "Hide critical path"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:672
-msgid "Hide reported hours"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84
-msgid "Day"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193
-msgid "Load: {0}%"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147
 msgid "showing resources"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:70
-msgid "Show/Hide labels"
+msgid "Week"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:56
-msgid "Hour"
+msgid "Group by"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:120
+#: org/zkoss/ganttz/Planner.java:679
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
-msgid "Graphics"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:251
-msgid "Set Start-Start"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152
-msgid "See resource allocation"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:289
-msgid "increasing zoom"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467
-msgid "Show all elements"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466
-msgid "All"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
-msgid "Refresh"
-msgstr ""
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:650
 msgid "Hide progress"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:617
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:162
+msgid "showing criteria"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:234
+msgid "Set Start-Start"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50
+msgid "Page"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:698
+msgid "Hide reported hours"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:42
+msgid "Refresh"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
+msgid "Start"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:76
+msgid "Expand/Collapse all"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
+msgid "Show/Hide labels"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:236
+msgid "Set End-End"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:38
+msgid "Zoom"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:643
 msgid "Show critical path"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java:271
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:34
-#: ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java:278
+msgid "Year"
-msgid "The date you entered is invalid"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java:272
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:56
-#: ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java:279
+msgid "None"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:86
+msgid "Resources"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:232
+msgid "Set End-Start"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:464
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:398
+msgid "Graphics are disabled"
+msgstr ""
+
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:272
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:279
 msgid "Please enter date not before"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java:273
+#: org/zkoss/ganttz/timetracker/TimeTracker.java:229
-#: ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java:280
+msgid "changing zoom"
-msgid "and no later than"
+msgstr ""
-msgstr ""
+
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:271
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:278
+msgid "The date you entered is invalid"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
+msgid "Show/Hide critical path"
+msgstr ""
+
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:46
+msgid "Quarter"
+msgstr ""
+

libreplan-webapp/src/main/resources/i18n/nl.po

@@ -9317,4 +9317,4 @@ msgstr "Geoffreerd"
 
 #: org/libreplan/web/tree/TreeController.java:1017
 msgid "cannot be negative"
-msgstr "kan niet negatief zijn"
+msgstr "kan niet negatief zijn"

libreplan-webapp/src/main/webapp/common/layout/login.zul

@@ -174,6 +174,19 @@
             </n:td>
         </n:tr>
 
+        <n:tr>
+            <n:td height="100">
+                <n:div align="left">
+                    <n:p><n:strong>${i18n:_('Did you know LibrePlan is funded only by donations, from people like you?')}</n:strong></n:p>
+                    <n:p>${i18n:_('We don’t show advertisements or sell your data.')} 
+                    <n:strong>${i18n:_('Ever!')}</n:strong> ${i18n:_('But')} <n:strong>${i18n:_('without you, LibrePlan can’t exist.')}</n:strong></n:p>
+                    <n:p>${i18n:_('Giving a gift today means LibrePlan continues to remain available and in active development tomorrow!')}</n:p>
+    
+                    <n:p><n:script src="https://opencollective.com/libreplan/donate/button.js" color="blue"></n:script></n:p>
+                </n:div>
+            </n:td>
+        </n:tr>
+
     </n:table>
 
     <n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0">

pom.xml

@@ -162,6 +162,17 @@
             </properties>
         </profile>
 
+        <!-- enable sponsoring request on login screen -->
+        <profile>
+            <id>sponsoring</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+               <sponsor-mode>true</sponsor-mode>
+            </properties>
+        </profile>
+
     </profiles>
 
     <repositories>
@@ -419,7 +430,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.7.21</version>
+                <version>2.0.16</version>
             </dependency>
 
             <!-- BeanShell (required by ZK)-->
@@ -844,7 +855,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.3.8.v20160314</version>
+                <version>9.4.56.v20240826</version>
                 <configuration>
                     <systemProperties>
                         <systemProperty>
@@ -886,7 +897,7 @@
                     <dependency>
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-simple</artifactId>
-                        <version>1.7.21</version>
+                        <version>2.0.16</version>
 					   <exclusions>
 					      <exclusion>
 					        <groupId>org.slf4j</groupId>

src/main/jetty/jetty-env.xml

@@ -15,8 +15,8 @@
                 <Set name="minConnectionsPerPartition">5</Set>
                 <Set name="maxConnectionsPerPartition">100</Set>
                 <Set name="acquireIncrement">5</Set>
-                <Set name="idleConnectionTestPeriod">30</Set>
+                <Set name="idleConnectionTestPeriodInMinutes">30</Set>
             </New>
         </Arg>
     </New>
-</Configure>
+</Configure>