Merge pull request #6522 from Countly/master-v14.03.14-into-next

Master v14.03.14 into next

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -2,6 +2,20 @@
 Dependencies:
 - Remove SQLite
 
+
+## Version 25.03.14
+
+Fixes:
+- [dashboard] Localized missing string in the dashboard
+- [localization] Added French translations
+
+Enterprise Fixes:
+- [active_directory] Fix for body parser empty request body issue
+
+Dependencies:
+- Bump lint-staged from 16.1.2 to 16.1.4
+
+
 ## Version 25.03.13
 Features:
 - [remote-config] Enable comparing newer/older app version in conditions

frontend/express/public/core/app-version/templates/app-version.html

@@ -12,13 +12,13 @@
   <cly-main>
   <cly-date-picker-g class="app-version-date-picker-container"></cly-date-picker-g>
   <div class="bu-columns bu-is-gapless bu-mt-2">
-    <h4 data-test-id="app-versions-for-label">App versions for </h4>
+    <h4 data-test-id="app-versions-for-label">{{i18n('app-versions.versions-for')}} </h4>
     <div class ="selector_wrapper">
       <el-select test-id="app-versions-for" v-model="selectedProperty" :arrow="false" :adaptiveLength="true">
         <el-option :test-id="item.value" :key="item.value" :value="item.value" :label="item.name" v-for="item in chooseProperties"></el-option>
       </el-select>
     </div>
-    <h4 data-test-id="as-label">&nbsp;&nbsp;as </h4>
+    <h4 data-test-id="as-label">&nbsp;&nbsp;{{i18n('app-versions.as')}} </h4>
     <div class ="selector_wrapper">
       <el-select test-id="as-value" v-model="selectedDisplay" :arrow="false" :adaptiveLength="true">
         <el-option :test-id="item.value" :key="item.value" :value="item.value" :label="item.name" v-for="item in chooseDisplay"></el-option>

frontend/express/public/core/events/javascripts/countly.details.views.js

@@ -6,7 +6,7 @@
         data: function() {
             return {
                 scoreTableExportSettings: {
-                    title: "AllEvents",
+                    title: CV.i18n("events.all-events"),
                     timeDependent: true
                 }
             };
@@ -504,7 +504,7 @@
         priority: 1,
         name: "detail",
         permission: "events",
-        title: "Event Stats",
+        title: CV.i18n('events.stats'),
         route: "#/analytics/events",
         component: AllEventsView,
         dataTestId: "event-stats",

frontend/express/public/core/events/javascripts/countly.overview.views.js

@@ -5,7 +5,7 @@
         data: function() {
             return {
                 scoreTableExportSettings: {
-                    title: "Events",
+                    title: CV.i18n("events.title"),
                     timeDependent: true
                 }
             };

frontend/express/public/core/events/templates/configureEvents.html

@@ -8,11 +8,11 @@
     <cly-form-step id="first-step">
       <div class="cly-events-overview-drawer__subheading bu-mt-3 bu-pb-2">{{i18n('events.overview.add.item')}}</div>
       <div class="bu-mb-4 bu-mt-2 bu-is-flex bu-is-justify-content-space-between	bu-is-align-items-center">
-        <el-select class="cly-events-overview-drawer__dropdown bu-mr-1" v-model="selectedOverviewEvents" placeholder="Select event">
+        <el-select class="cly-events-overview-drawer__dropdown bu-mr-1" v-model="selectedOverviewEvents" :placeholder="i18n('events.overview.choose-event')">
           <el-option v-for="item in configureEventsList" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <el-select class="cly-events-overview-drawer__dropdown bu-ml-1" v-model="selectProperty" placeholder="Select Property">
+        <el-select class="cly-events-overview-drawer__dropdown bu-ml-1" v-model="selectProperty" :placeholder="i18n('events.overview.choose-property')">
           <el-option v-for="item in eventProperties" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>

frontend/express/public/core/home/javascripts/countly.views.js

@@ -219,13 +219,13 @@ var HomeViewView = countlyVue.views.create({
         selected: function(command) {
             if (command === "download") {
                 var self = this;
-                CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "Starting the image generation process. You will be notified when it is ready. Please do not leave the website while the process is running.", sticky: true, clearAll: true});
+                CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: jQuery.i18n.map["home.download.starting"], sticky: true, clearAll: true});
                 this.$store.dispatch("countlyHomeView/downloadScreen").then(function() {
                     if (self.$store.state.countlyHomeView.image) {
-                        CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "<a href='" + self.$store.state.countlyHomeView.image + "'>Download</a>", sticky: true, clearAll: true});
+                        CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "<a href='" + self.$store.state.countlyHomeView.image + "'>" + jQuery.i18n.map["common.download"] + "</a>", sticky: true, clearAll: true});
                     }
                     else {
-                        CountlyHelpers.notify({type: "error", title: jQuery.i18n.map["common.success"], message: "ERROR", sticky: false, clearAll: true});
+                        CountlyHelpers.notify({type: "error", title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["common.error"], sticky: false, clearAll: true});
                     }
                 });
             }

frontend/express/public/core/logs/javascripts/countly.views.js

@@ -53,5 +53,5 @@
         this.renderWhenReady(ViewWrapper);
     });
 
-    app.addMenu("management", {code: "logs", permission: "core", url: "#/manage/logs", text: "Logs", priority: 50, tabsPath: "/manage/logs"});
+    app.addMenu("management", {code: "logs", permission: "core", url: "#/manage/logs", text: CV.i18n("sidebar.management.logs"), priority: 50, tabsPath: "/manage/logs"});
 })();

frontend/express/public/core/onboarding/templates/populator.html

@@ -2,7 +2,7 @@
     <div class="bu-is-flex bu-is-flex-direction-column bu-is-align-items-center initial-populator">
         <img src="./images/dashboard/onboarding/video-placeholder.svg" class="bu-is-block bu-mx-auto" />
         <cly-progress-bar :percentage="49" :color="'#0166D6'" :height="16" class="bu-mt-4 populator-start-modal-wrapper__proggress-bar"></cly-progress-bar>
-        <div class="setup-byline">Populating data for your app</div>
+        <div class="setup-byline">{{i18n('initial-setup.populating-data')}}</div>
         <el-button
             class="bu-is-block bu-mt-5 bu-mx-auto"
             size="medium"

frontend/express/public/localization/dashboard/dashboard.properties

@@ -424,6 +424,7 @@ sidebar.management.users = User Management
 sidebar.management.longtasks = Report Manager
 sidebar.management.help = Help Mode
 sidebar.management.jobs = Jobs
+sidebar.management.logs = Logs
 sidebar.management.token-manager = Token Manager
 sidebar.management.presets = Preset management
 sidebar.settings = Settings
@@ -446,6 +447,7 @@ sidebar.banner.upgrade-button = Create a free server
 #dashboard
 dashboard.apply = Apply
 dashboard.home-desc = Overview of collected data
+home.download.starting = Starting the image generation process. You will be notified when it is ready. Please do not leave the website while the process is running.
 dashboard.empty-title = Nothing to show
 dashboard.empty-text = There is no data to show. Enable features or customize this page to see data about chosen features.
 dashboard.audience = Audience
@@ -573,6 +575,8 @@ device_type.devices = Devices
 
 #app-versions
 app-versions.title = App Versions
+app-versions.versions-for = App versions for
+app-versions.as = as
 app-versions.description = Detailed information on the application versions of your application accessed by your users within the selected time period.
 web.app-versions.description = Detailed information on the website versions of your website accessed by your visitors within the selected time period.
 app-versions.table.app-version = App Version
@@ -596,6 +600,8 @@ platforms.versions = Versions
 
 #events
 events.title = Events
+events.all-events = All Events
+events.stats = Event Stats
 events.blueprint-title = MANAGE EVENTS
 events.blueprint-general = General
 events.blueprint-events-tab-title = EVENTS
@@ -1237,6 +1243,7 @@ initial-setup.time-zone-label = Select your time zone
 initial-setup.application-sample-label = We will populate some demo data for your app. Which example sounds the best?
 initial-setup.create-application = Create Application
 initial-setup.continue-data-population = Continue with data population
+initial-setup.populating-data = Populating data for your app
 initial-setup.consent-title = Before we start...
 initial-setup.analytics-blurb-1 = We utilize Countly to understand user interactions and collect feedback, helping us enhance our product continuously. However, your privacy remains our priority.
 initial-setup.analytics-blurb-2 = This analysis is done at the server level, so we will not see or collect any individual details or any data you record. The data is reported back only to our dedicated Countly server based in Europe. Please note, you can change your mind at any time in the settings.