Issues from last pull request resolved. Great thanx to luzpaz.

micromata · Dec 29, 2024 · a35971f · a35971f
1 parent c3b0602
commit a35971f
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 44 deletions.
diff --git a/projectforge-application/src/main/resources/i18nKeys.json b/projectforge-application/src/main/resources/i18nKeys.json
diff --git a/projectforge-business/src/main/java/org/projectforge/business/fibu/OrderExport.java b/projectforge-business/src/main/java/org/projectforge/business/fibu/OrderExport.java
@@ -81,7 +81,7 @@ private ExportColumn[] createOrderColumns() {
                 new I18nExportColumn(OrderCol.STATUS_COMMENT, "fibu.auftrag.statusBeschreibung", 10),
                 new I18nExportColumn(OrderCol.PROJECT, "fibu.projekt", MyXlsContentProvider.LENGTH_STD),
                 new I18nExportColumn(OrderCol.PROJECT_CUSTOMER, "fibu.kunde", MyXlsContentProvider.LENGTH_STD),
-                new I18nExportColumn(OrderCol.TITLE, "fibu.auftrag.titel", MyXlsContentProvider.LENGTH_STD),
+                new I18nExportColumn(OrderCol.TITLE, "fibu.auftrag.title", MyXlsContentProvider.LENGTH_STD),
                 new I18nExportColumn(OrderCol.PROJECTMANAGER, "fibu.projectManager", 30),
                 new I18nExportColumn(OrderCol.HEADOFBUSINESSMANAGER, "fibu.headOfBusinessManager", 30),
                 new I18nExportColumn(OrderCol.SALESMANAGER, "fibu.salesManager", 30),
@@ -149,8 +149,8 @@ private ExportColumn[] createPosColumns() {
                 new I18nExportColumn(PosCol.DATE_OF_ENTRY, "fibu.auftrag.erfassung.datum", MyXlsContentProvider.LENGTH_DATE),
                 new I18nExportColumn(PosCol.DATE_OF_DESICION, "fibu.auftrag.entscheidung.datum", MyXlsContentProvider.LENGTH_DATE),
                 new I18nExportColumn(PosCol.PROJECT, "fibu.projekt", MyXlsContentProvider.LENGTH_STD),
-                new I18nExportColumn(PosCol.ORDER_TITLE, "fibu.auftrag.titel", MyXlsContentProvider.LENGTH_STD),
-                new I18nExportColumn(PosCol.TITLE, "fibu.auftrag.titel", MyXlsContentProvider.LENGTH_STD),
+                new I18nExportColumn(PosCol.ORDER_TITLE, "fibu.auftrag.title", MyXlsContentProvider.LENGTH_STD),
+                new I18nExportColumn(PosCol.TITLE, "fibu.auftrag.title", MyXlsContentProvider.LENGTH_STD),
                 new I18nExportColumn(PosCol.TYPE, "fibu.auftrag.position.art", 10),
                 new I18nExportColumn(PosCol.PAYMENTTYPE, "fibu.auftrag.position.paymenttype", 20),
                 new I18nExportColumn(PosCol.STATUS, "status", 10),

diff --git a/projectforge-business/src/main/kotlin/org/projectforge/business/fibu/AuftragDO.kt b/projectforge-business/src/main/kotlin/org/projectforge/business/fibu/AuftragDO.kt
@@ -160,7 +160,7 @@ open class AuftragDO : DefaultBaseDO(), DisplayNameCapable, AttachmentsInfo {
     @get:JoinColumn(name = "projekt_fk", nullable = true)
     open var projekt: ProjektDO? = null
 
-    @PropertyInfo(i18nKey = "fibu.auftrag.titel")
+    @PropertyInfo(i18nKey = "fibu.auftrag.title")
     @FullTextField
     @get:Column(name = "titel", length = 1000)
     open var titel: String? = null

diff --git a/projectforge-business/src/main/kotlin/org/projectforge/business/fibu/AuftragsPositionDO.kt b/projectforge-business/src/main/kotlin/org/projectforge/business/fibu/AuftragsPositionDO.kt
@@ -101,7 +101,7 @@ open class AuftragsPositionDO : DefaultBaseDO(), DisplayNameCapable {
   @get:Column(name = "status", length = 30)
   open var status: AuftragsStatus? = null
 
-  @PropertyInfo(i18nKey = "fibu.auftrag.titel")
+  @PropertyInfo(i18nKey = "fibu.auftrag.title")
   @FullTextField
   @get:Column(name = "titel", length = 255)
   open var titel: String? = null

diff --git a/projectforge-business/src/main/resources/I18nResources_de.properties b/projectforge-business/src/main/resources/I18nResources_de.properties
@@ -81,7 +81,7 @@
 # system.admin.reindex.fromDate.tooltip=Re-index only those entries with a date of last modification newer than the given date. This date setting is optional.
 # system.admin.reindex.newestEntries=Number
 # system.admin.reindex.newestEntries.subtitle=Newest entries
-# system.admin.reindex.newestEntries.tooltip=The number of the newest entries of each database entity to re-index (based on the date of the last modification) . If empty then no limit of maximal re-indexed entries for each enitity is assumed.
+# system.admin.reindex.newestEntries.tooltip=The number of the newest entries of each database entity to re-index (based on the date of the last modification) . If empty then no limit of maximal re-indexed entries for each entity is assumed.
 # system.admin.reindexNewestNEntries.note=(Based on the time of last modification of the entries.)
 # system.admin.title=Administration
 # system.pluginAdmin.button.activate=Activate
@@ -1042,7 +1042,7 @@ fibu.auftrag.status.loi=LOI
 fibu.auftrag.status.optional=Optionale Position
 fibu.auftrag.status.potenzial=Potenzial
 fibu.auftrag.statusBeschreibung=Beschreibung Status
-fibu.auftrag.titel=Titel
+fibu.auftrag.title=Titel
 fibu.auftrag.title.add=Neuer/s Auftrag/Angebot
 fibu.auftrag.title.edit=Auftrag/Angebot bearbeiten
 fibu.auftrag.title.heading=Auftragsmanagement
@@ -2357,7 +2357,7 @@ system.admin.logViewer.userAgent=Browser
 ### not translated: system.admin.reindex.fromDate.tooltip=Re-index only those entries with a date of last modification newer than the given date. This date setting is optional.
 ### not translated: system.admin.reindex.newestEntries=Number
 ### not translated: system.admin.reindex.newestEntries.subtitle=Newest entries
-### not translated: system.admin.reindex.newestEntries.tooltip=The number of the newest entries of each database entity to re-index (based on the date of the last modification) . If empty then no limit of maximal re-indexed entries for each enitity is assumed.
+### not translated: system.admin.reindex.newestEntries.tooltip=The number of the newest entries of each database entity to re-index (based on the date of the last modification) . If empty then no limit of maximal re-indexed entries for each entity is assumed.
 ### not translated: system.admin.reindexNewestNEntries.note=(Based on the time of last modification of the entries.)
 ### not translated: system.admin.title=Administration
 ### not translated: system.pluginAdmin.button.activate=Activate

diff --git a/projectforge-business/src/main/resources/flyway/migrate/common/V7.0.0.4__7.0.0.4-RELEASE.sql b/projectforge-business/src/main/resources/flyway/migrate/common/V7.0.0.4__7.0.0.4-RELEASE.sql
@@ -4,7 +4,7 @@
 -- In java.time months are handled 1-based (from 1-January to 12-December).
 
 -- Increment month column (12 statements for preventing constraint violations)
--- UPDATE  t_fibu_buchungssatz SET month=month+1; doesn't work.
+-- UPDATE  t_fibu_buchungssatz SET month=month+1; does't work.
 UPDATE t_fibu_buchungssatz SET month=12 where month=11;
 UPDATE t_fibu_buchungssatz SET month=11 where month=10;
 UPDATE t_fibu_buchungssatz SET month=10 where month=9;

diff --git a/...resources/flyway/migrate/common/V7.4.1.0__7.4.1.0-RELEASE-VACATION_OTHER_REPLACEMENTS.sql b/...resources/flyway/migrate/common/V7.4.1.0__7.4.1.0-RELEASE-VACATION_OTHER_REPLACEMENTS.sql
@@ -1,4 +1,4 @@
--- Vacation forms of employees supports now others substitutes (replacements) in addition to the main substitute (replacement)
+-- Vacation forms of employees supports now others substitutes (replacements) in addition to the main substitue (replacement)
 
 CREATE TABLE t_employee_vacation_other_replacements
 (

diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/AuftragListPage.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/AuftragListPage.java
@@ -125,7 +125,7 @@ public void populateItem(final Item<ICellPopulator<AuftragDO>> item, final Strin
                 cellItemListener));
         columns.add(new CellItemListenerPropertyColumn<AuftragDO>(getString("fibu.projekt"), "projekt.name", "projekt.name",
                 cellItemListener));
-        columns.add(new CellItemListenerPropertyColumn<AuftragDO>(getString("fibu.auftrag.titel"), "titel", "titel",
+        columns.add(new CellItemListenerPropertyColumn<AuftragDO>(getString("fibu.auftrag.title"), "titel", "titel",
                 cellItemListener));
         columns.add(new AbstractColumn<AuftragDO, String>(new Model<String>(getString("label.position.short"))) {
             @Override

diff --git a/projectforge-wicket/src/main/kotlin/org/projectforge/web/fibu/AuftragEditForm.kt b/projectforge-wicket/src/main/kotlin/org/projectforge/web/fibu/AuftragEditForm.kt
@@ -134,7 +134,7 @@ open class AuftragEditForm(parentPage: AuftragEditPage?, data: AuftragDO) :
     run {
 
       // Title
-      val fs = gridBuilder.newFieldset(getString("fibu.auftrag.titel"))
+      val fs = gridBuilder.newFieldset(getString("fibu.auftrag.title"))
       val subject: MaxLengthTextField = RequiredMaxLengthTextField(
         InputPanel.WICKET_ID,
         PropertyModel(data, "titel")
@@ -524,7 +524,7 @@ open class AuftragEditForm(parentPage: AuftragEditPage?, data: AuftragDO) :
       val posGridBuilder = positionsPanel.createGridBuilder()
       posGridBuilder.newGridPanel()
       run {
-        val fs = posGridBuilder.newFieldset(getString("fibu.auftrag.titel"))
+        val fs = posGridBuilder.newFieldset(getString("fibu.auftrag.title"))
         fs.add(MaxLengthTextField(InputPanel.WICKET_ID, PropertyModel(position, "titel")))
       }
       posGridBuilder.newSplitPanel(GridSize.COL33)