Merge pull request #121 from 1c-syntax/l10n_10.8

New Crowdin updates

.yaspellerrc

@@ -3,9 +3,9 @@
   "lang": "ru",
   "format": "auto",
   "dictionary": [
-    "токен[\\W]*",
-    "реквест[\\W]*",
-    "коммит[\\W]*",
+    "токен.*",
+    "реквест.*",
+    "коммит.*",
     "пулл",
     "мерж",
     "Вкл",
@@ -36,10 +36,10 @@
     "Втр",
     "Срд",
     "Чтв",
-    "Чт",
     "Птн",
     "Суб",
     "Пн",
+    "Чт",
     "веб[-]*хук[оми]*",
     "тыс",
     "Конкретный",
@@ -91,6 +91,10 @@
     "гггг-ММ-дд", // формат даты
     "\\{[a-z0-9A-Z_]+\\}", // параметры
     "# [a-zA-Z0-9\\s\\(\\)]+", // комментарии
-    "[a-zA-Z][a-zA-Z0-9-\\._]{2,}[\\s=-]"
+    "[a-zA-Z][a-zA-Z0-9-\\._]{2,}[\\s=-]",
+    "warningsCount",
+    "не покрытые",
+    "MQR",
+    "ПО"
   ]
 }

README.md

@@ -26,23 +26,24 @@ Originally created by [SilverBulleters, LLC](https://silverbulleters.org). Now m
 
 ## Compatibility Matrix
 
-SonarQube        | sonar-l10n-ru 
-:---------------:|:-------------:
-10.7 - __latest__|10.7
-10.6.            |10.6
-10.5             |10.5
-10.4.            |10.4
-10.3             |10.3
-10.2             |10.2.1
-10.1             |10.1
-10.0             |10.0
-9.9 **LTS**      |9.9
-9.4 - 9.8.*      |9.4
-9.3              |9.3
-9.2              |9.2
-9.1              |9.1
-9.0              |9.0.1
-8.9              |8.9.2
+SonarQube              | sonar-l10n-ru 
+:---------------------:|:-------------:
+10.8/24.12 - __latest__|10.8
+10.7                   |10.7
+10.6                   |10.6
+10.5                   |10.5      
+10.4                   |10.4.1
+10.3                   |10.3.1
+10.2                   |10.2.2
+10.1                   |10.1.1
+10.0                   |10.0.1
+9.9 **LTS**            |9.9.1
+9.4 - 9.8.*            |9.4
+9.3                    |9.3
+9.2                    |9.2
+9.1                    |9.1
+9.0                    |9.0.1
+8.9                    |8.9.2
 
 ## How activate Russian language ?
 

build.gradle.kts

@@ -1,6 +1,3 @@
-import me.qoomon.gradle.gitversioning.GitVersioningPluginConfig
-import me.qoomon.gradle.gitversioning.GitVersioningPluginConfig.CommitVersionDescription
-import me.qoomon.gradle.gitversioning.GitVersioningPluginConfig.VersionDescription
 import org.apache.tools.ant.filters.EscapeUnicode
 import java.util.*
 
@@ -9,9 +6,9 @@ plugins {
     `maven-publish`
     jacoco
     id("org.cadixdev.licenser") version "0.6.1"
-    id("org.sonarqube") version "4.0.0.2929"
-    id("me.qoomon.git-versioning") version "3.0.0"
-    id("com.github.ben-manes.versions") version "0.28.0"
+    id("org.sonarqube") version "6.0.1.5171"
+    id("me.qoomon.git-versioning") version "6.4.4"
+    id("com.github.ben-manes.versions") version "0.51.0"
 }
 
 repositories {
@@ -21,23 +18,24 @@ repositories {
 group = "com.github.1c-syntax"
 description = "Translate SonarQube web application in Russian"
 
-gitVersioning.apply(closureOf<GitVersioningPluginConfig> {
-    preferTags = true
-    branch(closureOf<VersionDescription> {
-        pattern = "^(?!v[0-9]+).*"
-        versionFormat = "\${branch}-\${commit.short}\${dirty}"
-    })
-    tag(closureOf<VersionDescription> {
-        pattern = "v(?<tagVersion>[0-9].*)"
-        versionFormat = "\${tagVersion}\${dirty}"
-    })
-    commit(closureOf<CommitVersionDescription> {
-        versionFormat = "\${commit.short}\${dirty}"
-    })
-})
-
-val sonarQubeVersion = "10.7.0.96327"
-val sonarQubeAPIPluginVersion = "10.11.0.2468" // https://github.com/SonarSource/sonar-plugin-api#compatibility
+gitVersioning.apply {
+    refs {
+        considerTagsOnBranches = true
+        tag("v(?<tagVersion>[0-9].*)") {
+            version = "\${ref.tagVersion}\${dirty}"
+        }
+        branch(".+") {
+            version = "\${ref}-\${commit.short}\${dirty}"
+        }
+    }
+
+    rev {
+        version = "\${commit.short}\${dirty}"
+    }
+}
+
+val sonarQubeVersion = "24.12.0.100206" // "10.8.0.100206"
+val sonarQubeAPIPluginVersion = "10.14.0.2599" // https://github.com/SonarSource/sonar-plugin-api#compatibility
 val junitVersion = "5.6.1"
 
 dependencies {
@@ -84,7 +82,7 @@ tasks.check {
 tasks.jacocoTestReport {
     reports {
         xml.required.set(true)
-        xml.outputLocation.set(File("$buildDir/reports/jacoco/test/jacoco.xml"))
+        xml.outputLocation.set(File("${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml"))
     }
 }
 
@@ -205,6 +203,6 @@ sonarqube {
         property("sonar.organization", "1c-syntax")
         property("sonar.projectKey", "1c-syntax_sonar-l10n-ru")
         property("sonar.projectName", "Russian Pack for SonarQube")
-        property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacoco.xml")
+        property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/silverbulleters/sonar/plugins/l10n/RussianPackPlugin.java

@@ -5,7 +5,7 @@
  * SilverBulleters, LLC
  * mailto:[email protected]
  *
- * Copyright (c) 2020-2024
+ * Copyright (c) 2020-2025
  * 1c-syntax and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/org/silverbulleters/sonar/plugins/l10n/package-info.java

@@ -5,7 +5,7 @@
  * SilverBulleters, LLC
  * mailto:[email protected]
  *
- * Copyright (c) 2020-2024
+ * Copyright (c) 2020-2025
  * 1c-syntax and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later