From b8a980ab08d83f9239ba26c7e6ee95059175d406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Fri, 11 Jul 2025 23:58:31 +0300 Subject: [PATCH 1/6] #2331 (#2348) * chore: build update * chore: update code and fix 2331 * fix: duplicate filters --- package.json | 2 +- .../dashboard/dashboard.component.html | 48 ++--- .../dashboard/dashboard.component.scss | 138 +++++++------ .../dashboard/dashboard.component.ts | 59 +++--- src/app/group/group.component.html | 2 +- .../edit-ideation-deadline.component.html | 2 +- .../idea-reply/idea-reply.component.html | 2 +- .../idea/idea-dialog.component.html | 4 +- .../components/ideabox/ideabox.component.html | 4 +- .../ideation-create.component.html | 6 +- .../topic-ideation.component.html | 190 +----------------- .../topic-ideation.component.ts | 2 + .../groupbox/groupbox.component.html | 2 +- .../topicbox/topicbox.component.html | 4 +- .../activity/activity.component.html | 6 +- .../argument-edits.component.html | 2 +- .../argument/argument.component.html | 2 +- .../edit-discussion-deadline.component.html | 2 +- .../missing-discussion.component.html | 2 +- .../topic-arguments.component.html | 10 +- ...ic-discussion-create-dialog.component.html | 2 +- .../topic-form/topic-form.component.html | 6 +- .../topic-settings.component.html | 2 +- .../topic-vote-cast.component.html | 2 +- .../topic-vote-create-dialog.component.html | 2 +- .../topic-vote-create.component.html | 2 +- .../topic-vote-deadline.component.html | 2 +- .../topic-vote-reminder-dialog.component.html | 2 +- src/app/topic/topic.component.html | 8 +- .../vote-create/vote-create.component.html | 4 +- src/assets/i18n/en.json | 1 + 31 files changed, 181 insertions(+), 341 deletions(-) diff --git a/package.json b/package.json index ccfd46d22..d35ef9571 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dev": "node ./prebuild.js && ng serve --host", "ng": "ng", "start": "node ./prebuildDist.js && node ./index.js", - "build": "node ./prebuild.js && ng build", + "build": "node ./prebuild.js && ng build --configuration production", "watch": "ng build --watch --configuration development", "test": "ng test" }, diff --git a/src/app/core/components/dashboard/dashboard.component.html b/src/app/core/components/dashboard/dashboard.component.html index e9a935d36..caacbbfa6 100644 --- a/src/app/core/components/dashboard/dashboard.component.html +++ b/src/app/core/components/dashboard/dashboard.component.html @@ -146,8 +146,8 @@ - -
+ +
-
+
@@ -263,9 +263,9 @@
-
+
-
- +
@@ -322,8 +322,8 @@ - - + +
@@ -345,7 +345,7 @@
- +
@@ -368,7 +368,7 @@
-
+
@@ -383,26 +383,28 @@
- - - -
- +
+
-
+
-
-
+
@@ -483,8 +485,8 @@
- -
+
- +
@@ -543,7 +545,7 @@
- + @@ -697,7 +699,7 @@ fill="#2C3B47" /> - + diff --git a/src/app/core/components/dashboard/dashboard.component.scss b/src/app/core/components/dashboard/dashboard.component.scss index 0ca9b3dcd..0a93c1fa9 100644 --- a/src/app/core/components/dashboard/dashboard.component.scss +++ b/src/app/core/components/dashboard/dashboard.component.scss @@ -1,9 +1,13 @@ @use "mixins"; +// Common variables for better maintainability +$border-radius: 16px; +$padding-standard: 24px; +$gap-standard: 16px; + #page_header { - padding: 16px 24px; + padding: 16px $padding-standard; display: flex; - flex-direction: row; justify-content: space-between; @include mixins.tablet { @@ -12,23 +16,22 @@ @include mixins.mobile { background-color: var(--color-surfaces); - border-radius: 0px 0px 16px 16px; + border-radius: 0 0 $border-radius $border-radius; } } #dashboard_wrap { display: flex; flex-direction: column; - gap: 24px; + gap: $padding-standard; width: 100%; height: 100%; @include mixins.tablet { - margin-top: 24px; + margin-top: $padding-standard; } @include mixins.mobile { - display: flex; gap: 40px; padding: 0; } @@ -37,19 +40,17 @@ display: none; @include mixins.mobile { display: flex; - margin-top: 24px; + margin-top: $padding-standard; } } .dashboard_section_row { display: flex; - flex-direction: row; - gap: 16px; + gap: $gap-standard; &.news_section { .mobile { display: none; - @include mixins.mobile { display: flex; } @@ -59,23 +60,31 @@ flex-direction: column; } } + @include mixins.mobile { - display: flex; padding: 0 8px; flex-direction: column; width: 100%; } - #achievements { + + // Common card styles + #achievements, + #engagements, + #news, + #help_us { display: flex; flex-direction: column; + background-color: var(--color-surfaces); + border-radius: $border-radius; + padding: $padding-standard $gap-standard; + } + + #achievements { align-items: center; justify-content: center; width: 280px; height: 280px; gap: 8px; - background-color: var(--color-surfaces); - border-radius: 16px; - padding: 24px 16px; @include mixins.tablet { width: 50%; @@ -83,6 +92,7 @@ @include mixins.mobile { width: 100%; } + .box_title { font-weight: 600; font-size: 18px; @@ -97,13 +107,8 @@ } #engagements { - display: flex; - flex-direction: column; width: 100%; height: 280px; - background-color: var(--color-surfaces); - border-radius: 16px; - padding: 24px 16px; @include mixins.tablet { width: 50%; @@ -112,6 +117,7 @@ @include mixins.mobile { width: 100%; } + #chart_area { #chart { display: flex; @@ -126,19 +132,13 @@ display: flex; width: 80px; height: 80px; - &.discussion { - background-color: var(--color-discussion); - } - &.voting { - background-color: var(--color-voting); - } - &.follow_up { - background-color: var(--color-follow-up); - } - &.ideation { - background-color: var(--color-ideation); - } + + &.discussion { background-color: var(--color-discussion); } + &.voting { background-color: var(--color-voting); } + &.follow_up { background-color: var(--color-follow-up); } + &.ideation { background-color: var(--color-ideation); } } + #info_area { display: flex; flex-direction: column; @@ -158,17 +158,12 @@ } #news { - display: flex; - flex-direction: column; width: 100%; - background-color: var(--color-surfaces); - border-radius: 16px; - padding: 16px; - gap: 16px; + gap: $gap-standard; min-height: 456px; @include mixins.tablet { - gap: 24px; + gap: $padding-standard; } @include mixins.mobile { @@ -180,19 +175,19 @@ .news_items_wrap { display: flex; flex-direction: column; - gap: 16px; + gap: $gap-standard; @include mixins.tablet { - gap: 24px; + gap: $padding-standard; } .news_item { display: flex; - gap: 24px; + gap: $padding-standard; @include mixins.mobile { flex-direction: column; - gap: 16px; + gap: $gap-standard; } .news_image { @@ -208,11 +203,13 @@ aspect-ratio: 1; object-fit: cover; } + @include mixins.mobile { width: 100%; height: 166px; } } + .news_text { display: flex; flex-direction: column; @@ -232,8 +229,6 @@ } #help_us { - display: flex; - flex-direction: column; justify-content: flex-start; align-items: center; text-align: center; @@ -241,12 +236,10 @@ max-width: 280px; min-height: 456px; background-color: var(--color-blue-100); - border-radius: 16px; - padding: 24px 16px; - gap: 24px; + gap: $padding-standard; @include mixins.mobile { - margin-top: 16px; + margin-top: $gap-standard; } #title { @@ -259,7 +252,7 @@ display: flex; flex-direction: column; width: 100%; - gap: 24px; + gap: $padding-standard; } @include mixins.tablet { @@ -270,14 +263,15 @@ flex-direction: row; } } + @include mixins.mobile { max-width: 100%; width: 100%; - .help_items_wrap { flex-direction: column; } } + .help_item { display: flex; flex-direction: column; @@ -285,6 +279,7 @@ align-items: center; gap: 10px; } + a { align-items: center; display: flex; @@ -312,6 +307,7 @@ fill: var(--color-link); } } + .view_more_link { @include mixins.mobile { display: none; @@ -332,29 +328,32 @@ } } } + .section_content { display: flex; flex-direction: row; overflow-x: scroll; - gap: 16px; - padding: 24px 0; + gap: $gap-standard; + padding: $padding-standard 0; @include mixins.mobile { - padding: 16px 0; + padding: $gap-standard 0; } - } } } + #subscribe_box { display: flex; background-color: var(--color-blue-100); justify-content: space-between; - padding: 24px 24px 0 24px; + padding: $padding-standard $padding-standard 0 $padding-standard; + @include mixins.tablet { padding-bottom: 56px; overflow: hidden; } + @include mixins.mobile { margin-top: 40px; margin-bottom: 56px; @@ -366,9 +365,11 @@ display: flex; flex-direction: column; gap: 32px; + @include mixins.mobile { padding: 0; } + #subscribe_text_wrap { display: flex; flex-direction: column; @@ -378,10 +379,12 @@ line-height: 24px; } } + #subscribe_form_input_wrap { display: flex; flex-direction: row; - gap: 16px; + gap: $gap-standard; + @include mixins.mobile { flex-direction: column; width: 100%; @@ -389,24 +392,28 @@ @include mixins.tablet { flex-direction: column; width: 100%; + } + + @include mixins.tablet { padding-bottom: 20px; } - input { - width: 400px; - @include mixins.tablet { - width: 100%; - } - @include mixins.mobile { - width: 100%; + input { + width: 400px; + @include mixins.tablet { + width: 100%; + } + @include mixins.mobile { + width: 100%; + } } - } button { padding: 8px 62px; } } } + #subscribe_illustration { display: flex; position: relative; @@ -417,6 +424,7 @@ overflow: hidden; justify-content: center; } + svg { width: 100%; height: 100%; diff --git a/src/app/core/components/dashboard/dashboard.component.ts b/src/app/core/components/dashboard/dashboard.component.ts index f5f1d117b..fa050d8b1 100644 --- a/src/app/core/components/dashboard/dashboard.component.ts +++ b/src/app/core/components/dashboard/dashboard.component.ts @@ -1,7 +1,7 @@ import { CookieService } from 'ngx-cookie-service'; import { OnboardingComponent } from './../onboarding/onboarding.component'; import { DialogService } from 'src/app/shared/dialog'; -import { Component } from '@angular/core'; +import { Component, ChangeDetectionStrategy, signal } from '@angular/core'; import { AppService } from '@services/app.service'; import { AuthService } from '@services/auth.service'; import { UserTopicService } from '@services/user-topic.service'; @@ -19,38 +19,41 @@ import { News } from 'src/app/interfaces/news'; @Component({ selector: 'app-dashboard', templateUrl: './dashboard.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, styleUrls: ['./dashboard.component.scss'], standalone: false }) export class DashboardComponent { - groups$: Observable = of([]); - topics$: Observable = of([]); - publictopics$: Observable = of([]); - publicgroups$: Observable = of([]); + // Observable properties with proper typing + readonly groups$: Observable = of([]); + readonly topics$: Observable = of([]); + readonly publictopics$: Observable = of([]); + readonly publicgroups$: Observable = of([]); + readonly news$: Observable = of([]); - news$: Observable = of([]); - showNoEngagements = false; + // Convert to signals for better performance + readonly showNoEngagements = signal(false); + readonly showPublic = signal(true); + readonly showCreate = signal(false); + readonly wWidth = signal(window.innerWidth); - showPublic = true; - showCreate = false; - wWidth = window.innerWidth; constructor( - public auth: AuthService, - public app: AppService, - public translate: TranslateService, - private UserTopicService: UserTopicService, - private PublicTopicService: PublicTopicService, - private PublicGroupService: PublicGroupService, - private GroupService: GroupService, - private NewsService: NewsService, - private dialog: DialogService, - private CookieService: CookieService + public readonly auth: AuthService, + public readonly app: AppService, + public readonly translate: TranslateService, + private readonly UserTopicService: UserTopicService, + private readonly PublicTopicService: PublicTopicService, + private readonly PublicGroupService: PublicGroupService, + private readonly GroupService: GroupService, + private readonly NewsService: NewsService, + private readonly dialog: DialogService, + private readonly CookieService: CookieService ) { this.groups$ = this.GroupService.loadItems(); this.news$ = this.NewsService.get().pipe( map((news) => { - news.forEach((item:News) => { - var elem = document.createElement('div'); + news.forEach((item: News) => { + const elem = document.createElement('div'); elem.innerHTML = item.content; const img = elem.querySelector('img'); if (img) { @@ -64,8 +67,8 @@ export class DashboardComponent { this.topics$ = this.UserTopicService.loadItems().pipe( tap((topics) => { if (topics.length === 0) { - this.showPublic = true; - this.showNoEngagements = true; + this.showPublic.set(true); + this.showNoEngagements.set(true); } }) ); @@ -74,8 +77,8 @@ export class DashboardComponent { this.app.mobileNavBox = true; } - trackByTopic(index: number, element: any) { - return element.id; + trackByTopic(index: number, element: Topic | Group): number { + return typeof element.id === 'string' ? parseInt(element.id, 10) : element.id; } ngAfterViewInit(): void { @@ -93,8 +96,8 @@ export class DashboardComponent { } } - showCreateMenu () { - this.showCreate = !this.showCreate; + showCreateMenu(): void { + this.showCreate.update(current => !current); } ngOnDestroy(): void { diff --git a/src/app/group/group.component.html b/src/app/group/group.component.html index f4f54ad20..028511391 100644 --- a/src/app/group/group.component.html +++ b/src/app/group/group.component.html @@ -491,7 +491,7 @@ d="M6 2H4V3H3C2.44772 3 2 3.44771 2 4V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V4C14 3.44772 13.5523 3 13 3H12V2H10V3H6V2ZM4 7H6V9H4V7ZM4 10H6V12H4V10ZM9 7H7V9H9V7ZM7 10H9V12H7V10ZM12 7H10V9H12V7ZM10 10H12V12H10V10ZM3 6H13V13H3V6Z" fill="#2C3B47" /> - {{group.createdAt | date: 'YYYY-MM-dd HH:mm'}} + {{group.createdAt | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/ideation/components/edit-ideation-deadline/edit-ideation-deadline.component.html b/src/app/ideation/components/edit-ideation-deadline/edit-ideation-deadline.component.html index 6d6d84599..921e81b30 100644 --- a/src/app/ideation/components/edit-ideation-deadline/edit-ideation-deadline.component.html +++ b/src/app/ideation/components/edit-ideation-deadline/edit-ideation-deadline.component.html @@ -26,7 +26,7 @@
- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/ideation/components/idea-reply/idea-reply.component.html b/src/app/ideation/components/idea-reply/idea-reply.component.html index 350dfe491..4f5d9a087 100644 --- a/src/app/ideation/components/idea-reply/idea-reply.component.html +++ b/src/app/ideation/components/idea-reply/idea-reply.component.html @@ -27,7 +27,7 @@
-
{{argument.createdAt | date : 'yyyy-MM-dd HH:mm'}}
+
{{argument.createdAt | date : 'y-MM-dd HH:mm'}}
diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index 2b3a5e64f..b6f75f1fd 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -170,7 +170,7 @@ >
{{ - ideation.deadline | date : "YYYY-MM-dd HH:mm" + ideation.deadline | date : "y-MM-dd HH:mm" }}
@@ -186,7 +186,7 @@
- +
@@ -838,95 +838,6 @@
- - -
-
-
- - - {{ideaFilters.age}} - -
-
- - -
-
-
-
-
-
- {{ i + 1 }} -
-
-
- - - -
-
-
- - - {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_MALE' - | - translate}} - - {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_FEMALE' - | - translate}} - - {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER' - | - translate}} -
-
- - -
-
-
-
-
-
- {{ "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_" + (gender === "other" ? gender + "_placeholder" : gender).toUpperCase() | translate }} -
-
-
- - - -
-
-
- - - {{ideaFilters.residence | titlecase}} - -
-
- - -
-
-
-
-
-
- {{ residence.name }} -
-
-
-
-
-
@@ -1646,96 +1557,6 @@ translate="COMPONENTS.TOPIC_IDEATION.BTN_APPLY" >
- -
- - - - - - -
- - - -
- - -
- -
- - - - - - -
- - - -
- - -
- -
- - - - - - -
- - - - - -
- - -
@@ -1802,6 +1623,9 @@
+ +
+
@@ -2150,7 +1974,7 @@ >
diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 067062b03..ee996e44d 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -48,6 +48,7 @@ export class TopicIdeationComponent { users = []; participantsCount = 0; ideas$ = of([]); + ideasCount$ = of (0); folders$ = of([]); folders = []; allIdeas$: Idea[] = []; @@ -107,6 +108,7 @@ export class TopicIdeationComponent { ) {} ngOnInit(): void { + this.ideasCount$ = this.TopicIdeaService.countTotal$; this.ideas$ = combineLatest([ this.ideaTypeFilter$, this.orderFilter$, diff --git a/src/app/my-groups/components/groupbox/groupbox.component.html b/src/app/my-groups/components/groupbox/groupbox.component.html index 4934e9883..8a55ecfdf 100644 --- a/src/app/my-groups/components/groupbox/groupbox.component.html +++ b/src/app/my-groups/components/groupbox/groupbox.component.html @@ -40,6 +40,6 @@
-
+
diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index e0370ece0..9e8fd6e16 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -156,7 +156,7 @@
-
{{topic.createdAt | date:'YYYY-MM-dd'}}
+
{{topic.createdAt | date:'y-MM-dd'}}
@@ -186,7 +186,7 @@
-
{{argument.createdAt | date : 'yyyy-MM-dd HH:mm'}}
+
{{argument.createdAt | date : 'y-MM-dd HH:mm'}}
- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/topic/components/missing-discussion/missing-discussion.component.html b/src/app/topic/components/missing-discussion/missing-discussion.component.html index ff6672e9f..b6ea91321 100644 --- a/src/app/topic/components/missing-discussion/missing-discussion.component.html +++ b/src/app/topic/components/missing-discussion/missing-discussion.component.html @@ -53,7 +53,7 @@

- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/topic/components/topic-arguments/topic-arguments.component.html b/src/app/topic/components/topic-arguments/topic-arguments.component.html index 312440f52..0323a520c 100644 --- a/src/app/topic/components/topic-arguments/topic-arguments.component.html +++ b/src/app/topic/components/topic-arguments/topic-arguments.component.html @@ -68,7 +68,7 @@
- {{discussion.deadline | date:'YYYY-MM-dd HH:mm'}} + {{discussion.deadline | date:'y-MM-dd HH:mm'}}
@@ -155,9 +155,9 @@
- +
- +
@@ -168,7 +168,7 @@ fill="#2C3B47" /> - +
- +
diff --git a/src/app/topic/components/topic-discussion-create-dialog/topic-discussion-create-dialog.component.html b/src/app/topic/components/topic-discussion-create-dialog/topic-discussion-create-dialog.component.html index a6f0eb216..b9fd7dd4a 100644 --- a/src/app/topic/components/topic-discussion-create-dialog/topic-discussion-create-dialog.component.html +++ b/src/app/topic/components/topic-discussion-create-dialog/topic-discussion-create-dialog.component.html @@ -162,7 +162,7 @@

- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}

diff --git a/src/app/topic/components/topic-form/topic-form.component.html b/src/app/topic/components/topic-form/topic-form.component.html index 33e5098c9..223d54977 100644 --- a/src/app/topic/components/topic-form/topic-form.component.html +++ b/src/app/topic/components/topic-form/topic-form.component.html @@ -899,7 +899,7 @@
- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}
@@ -1029,7 +1029,7 @@
- {{discussion.deadline | date:'YYYY-MM-dd HH:mm'}} + {{discussion.deadline | date:'y-MM-dd HH:mm'}}
@@ -1268,7 +1268,7 @@ d="M6 2H4V3H3C2.44772 3 2 3.44771 2 4V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V4C14 3.44772 13.5523 3 13 3H12V2H10V3H6V2ZM4 7H6V9H4V7ZM4 10H6V12H4V10ZM9 7H7V9H9V7ZM7 10H9V12H7V10ZM12 7H10V9H12V7ZM10 10H12V12H10V10ZM3 6H13V13H3V6Z" fill="#2C3B47" /> - {{topic.createdAt | date: 'YYYY-MM-dd HH:mm'}} + {{topic.createdAt | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/topic/components/topic-settings/topic-settings.component.html b/src/app/topic/components/topic-settings/topic-settings.component.html index 203f484da..d80e4f9b7 100644 --- a/src/app/topic/components/topic-settings/topic-settings.component.html +++ b/src/app/topic/components/topic-settings/topic-settings.component.html @@ -110,7 +110,7 @@
- {{topic.vote?.endsAt | date:'yyyy-MM-dd HH:mm Z'}} + {{topic.vote?.endsAt | date:'y-MM-dd HH:mm Z'}}
diff --git a/src/app/topic/components/topic-vote-cast/topic-vote-cast.component.html b/src/app/topic/components/topic-vote-cast/topic-vote-cast.component.html index e44a90dc3..93d793091 100644 --- a/src/app/topic/components/topic-vote-cast/topic-vote-cast.component.html +++ b/src/app/topic/components/topic-vote-cast/topic-vote-cast.component.html @@ -68,7 +68,7 @@
{{(vote.endsAt)? - (vote.endsAt | date:'YYYY-MM-dd HH:mm') : ('COMPONENTS.TOPIC_VOTE_CAST.NO_DEADLINE' | + (vote.endsAt | date:'y-MM-dd HH:mm') : ('COMPONENTS.TOPIC_VOTE_CAST.NO_DEADLINE' | translate)}} diff --git a/src/app/topic/components/topic-vote-create/topic-vote-create-dialog.component.html b/src/app/topic/components/topic-vote-create/topic-vote-create-dialog.component.html index 66fa6a97d..beb394e66 100644 --- a/src/app/topic/components/topic-vote-create/topic-vote-create-dialog.component.html +++ b/src/app/topic/components/topic-vote-create/topic-vote-create-dialog.component.html @@ -713,7 +713,7 @@

- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}

diff --git a/src/app/topic/components/topic-vote-create/topic-vote-create.component.html b/src/app/topic/components/topic-vote-create/topic-vote-create.component.html index 1e8d64598..cc233b027 100644 --- a/src/app/topic/components/topic-vote-create/topic-vote-create.component.html +++ b/src/app/topic/components/topic-vote-create/topic-vote-create.component.html @@ -524,7 +524,7 @@
- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/topic/components/topic-vote-deadline/topic-vote-deadline.component.html b/src/app/topic/components/topic-vote-deadline/topic-vote-deadline.component.html index 8cdb61d0e..2c2e7ab09 100644 --- a/src/app/topic/components/topic-vote-deadline/topic-vote-deadline.component.html +++ b/src/app/topic/components/topic-vote-deadline/topic-vote-deadline.component.html @@ -26,7 +26,7 @@
- {{deadline | date: 'YYYY-MM-dd HH:mm'}} + {{deadline | date: 'y-MM-dd HH:mm'}}
diff --git a/src/app/topic/components/topic-vote-reminder-dialog/topic-vote-reminder-dialog.component.html b/src/app/topic/components/topic-vote-reminder-dialog/topic-vote-reminder-dialog.component.html index 9a945e4b2..b4365b1b8 100644 --- a/src/app/topic/components/topic-vote-reminder-dialog/topic-vote-reminder-dialog.component.html +++ b/src/app/topic/components/topic-vote-reminder-dialog/topic-vote-reminder-dialog.component.html @@ -53,7 +53,7 @@
{{vote.votersCount || 0}}
+ [translateParams]="{deadline: (vote.endsAt | date: 'y-MM-dd HH:mm')}">
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index aec7c707c..cff37ea64 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -961,7 +961,7 @@ d="M6 2H4V3H3C2.44772 3 2 3.44771 2 4V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V4C14 3.44772 13.5523 3 13 3H12V2H10V3H6V2ZM4 7H6V9H4V7ZM4 10H6V12H4V10ZM9 7H7V9H9V7ZM7 10H9V12H7V10ZM12 7H10V9H12V7ZM10 10H12V12H10V10ZM3 6H13V13H3V6Z" fill="#2C3B47" /> - {{ topic.createdAt | date : "YYYY-MM-dd HH:mm" }} + {{ topic.createdAt | date : "y-MM-dd HH:mm" }}
@@ -1202,7 +1202,7 @@
- {{ ideation.deadline | date : "YYYY-MM-dd" }} + {{ ideation.deadline | date : "y-MM-dd" }}
@@ -1414,7 +1414,7 @@
- {{ topic.endsAt | date : "YYYY-MM-dd HH:mm" }} + {{ topic.endsAt | date : "y-MM-dd HH:mm" }}
@@ -1796,4 +1796,4 @@ - \ No newline at end of file + diff --git a/src/app/voting/components/vote-create/vote-create.component.html b/src/app/voting/components/vote-create/vote-create.component.html index 5ac8d6c48..d3fc53fab 100644 --- a/src/app/voting/components/vote-create/vote-create.component.html +++ b/src/app/voting/components/vote-create/vote-create.component.html @@ -906,7 +906,7 @@
{{(vote.endsAt)? - (vote.endsAt | date:'YYYY-MM-dd HH:mm') : ('COMPONENTS.TOPIC_VOTE_CAST.NO_DEADLINE' | + (vote.endsAt | date:'y-MM-dd HH:mm') : ('COMPONENTS.TOPIC_VOTE_CAST.NO_DEADLINE' | translate)}}
@@ -1131,7 +1131,7 @@ d="M6 2H4V3H3C2.44772 3 2 3.44771 2 4V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V4C14 3.44772 13.5523 3 13 3H12V2H10V3H6V2ZM4 7H6V9H4V7ZM4 10H6V12H4V10ZM9 7H7V9H9V7ZM7 10H9V12H7V10ZM12 7H10V9H12V7ZM10 10H12V12H10V10ZM3 6H13V13H3V6Z" fill="#2C3B47" /> - {{topic.createdAt | date: 'YYYY-MM-dd HH:mm'}} + {{topic.createdAt | date: 'y-MM-dd HH:mm'}}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 5a8129c52..ce895d91a 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, From fe4b7e449992bdfd06e85eb1dc159f965058ff97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 15 Jul 2025 23:23:16 +0300 Subject: [PATCH 2/6] chore: Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 562ff47d2..b0d913920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2025-07-15 - v1.3.11 + * Update: Issue FE#2331: IDEAS: Show number of ideas returned by ideas filters (and search) + ## 2025-06-19 - v1.3.10 * Fix: Issue FE #2302: IDEAS: Allow users to select multiple ages in age filter * Fix: Issue FE #2034: IDEAS: Add filters for demographic data From bfbe3c8c827c19b68e6423b7a072aee7321cb323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 15 Jul 2025 23:23:21 +0300 Subject: [PATCH 3/6] 1.3.10 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8d7887b72..acd3f6b6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "citizenos-fe", - "version": "1.3.9", + "version": "1.3.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "citizenos-fe", - "version": "1.3.9", + "version": "1.3.10", "dependencies": { "@angular/animations": "^20.0.4", "@angular/cdk": "^20.0.3", diff --git a/package.json b/package.json index d35ef9571..15490c1ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "citizenos-fe", - "version": "1.3.9", + "version": "1.3.10", "scripts": { "dev": "node ./prebuild.js && ng serve --host", "ng": "ng", From cd5e4bc8f709041e8c968d727c4c0f32270e2805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 15 Jul 2025 23:23:56 +0300 Subject: [PATCH 4/6] chore: release 1.3.11 --- package.json | 2 +- src/assets/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 15490c1ba..029aca06d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "citizenos-fe", - "version": "1.3.10", + "version": "1.3.11", "scripts": { "dev": "node ./prebuild.js && ng serve --host", "ng": "ng", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ce895d91a..e99b43070 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -787,7 +787,7 @@ "OPT_DOWNLOAD_IDEAS": "Export ideas", "OPT_EDIT_IDEATION": "Edit idea gathering", "OPT_CLOSE_IDEATION": "End idea gathering", - "SEARCH": "Search", + "SEARCH": "@:DEFAULT.NAV_MOBILE.BTN_SEARCH", "FILTER_ALL": "@:VIEWS.MY_TOPICS.FILTER_ALL", "FILTER_TYPE_YOUR_IDEAS": "Your ideas", "FILTER_TYPE_FAVOURITES": "Saved ideas", From b3a52fa5756dd01c380882f3c1e48c608ab551b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 15 Jul 2025 23:44:32 +0300 Subject: [PATCH 5/6] New Crowdin updates (#2335) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (Czech) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (Estonian) --- src/assets/i18n/bg.json | 1 + src/assets/i18n/cs.json | 55 +++++++++++++++++++++-------------------- src/assets/i18n/de.json | 1 + src/assets/i18n/es.json | 1 + src/assets/i18n/et.json | 1 + src/assets/i18n/fr.json | 1 + src/assets/i18n/id.json | 1 + src/assets/i18n/nl.json | 1 + src/assets/i18n/ru.json | 1 + src/assets/i18n/sk.json | 1 + src/assets/i18n/so.json | 1 + src/assets/i18n/sq.json | 1 + src/assets/i18n/sw.json | 1 + src/assets/i18n/uk.json | 1 + 14 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json index 8cd98b54d..2911df0bf 100644 --- a/src/assets/i18n/bg.json +++ b/src/assets/i18n/bg.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json index 219db5609..b913f2e1d 100644 --- a/src/assets/i18n/cs.json +++ b/src/assets/i18n/cs.json @@ -1,11 +1,11 @@ { - "MSG_ISSUE_NOTIFICATION_TITLE": "Temporary Disruption on Citizen OS Platform", - "MSG_ISSUE_NOTIFICATION": "We will post an update as soon as the issue is resolved.", + "MSG_ISSUE_NOTIFICATION_TITLE": "Dočasné narušení na Občanské OS platformě", + "MSG_ISSUE_NOTIFICATION": "Jakmile bude problém vyřešen, zveřejníme aktualizaci.", "MSG_REDESIGN_TITLE": "Přepracováváme naši platformu!", - "MSG_REDESIGN_CONTENT": "In the coming months, we’ll be starting to roll out a new and improved Citizen OS! Any questions, concerns, or to offer your help as a beta tester, contact Sara on info@citizenos.com", + "MSG_REDESIGN_CONTENT": "V nadcházejících měsících začneme realizovat nový a vylepšený Citizen OS! Jakékoli dotazy, obavy, nebo nabídnout vaši pomoc jako beta tester, kontaktujte Sara na info@citizenos. om", "MSG_REDESIGN_BTN_CLOSE": "OK, rozumím", - "META_DEFAULT_TITLE": "Citizen OS - a free participation platform for civil society.", - "META_DEFAULT_DESCRIPTION": "Citizen OS helps you gather ideas, discuss, vote, and make decisions together.", + "META_DEFAULT_TITLE": "Citizen OS - platforma volné účasti pro občanskou společnost.", + "META_DEFAULT_DESCRIPTION": "Citizen OS vám pomáhá shromažďovat myšlenky, diskutovat, hlasovat a činit rozhodnutí společně.", "META_DEFAULT_KEYWORDS": "elektronické rozhodování, elektronická správa věcí veřejných, elektronická demokracie, demokracie, přímá demokracie, likvidní demokracie", "BTN_YES": "ANO", "BTN_NO": "NE", @@ -23,10 +23,10 @@ "BTN_BULK_ACTIONS": "Hromadné akce", "TXT_TOPIC_STATUS_ALL": "vše", "TXT_TOPIC_STATUS_DRAFT": "koncept", - "TXT_TOPIC_STATUS_IDEATION": "in idea gathering", - "TXT_TOPIC_STATUS_INPROGRESS": "in discussion", + "TXT_TOPIC_STATUS_IDEATION": "v myšlence shromažďování", + "TXT_TOPIC_STATUS_INPROGRESS": "v diskuzi", "TXT_TOPIC_STATUS_VOTING": "při hlasování", - "TXT_TOPIC_STATUS_FOLLOWUP": "in action", + "TXT_TOPIC_STATUS_FOLLOWUP": "v akci", "TXT_TOPIC_STATUS_CLOSED": "zavřeno", "TXT_TOPIC_STATUS_MODERATED": "skryta administrátorem", "TXT_TOPIC_LEVELS_ADMIN": "admin", @@ -83,7 +83,7 @@ "PLACEHOLDER_WRITE_YOUR_EMAIL": "Vaše e-mailová adresa (volitelné)", "PLACEHOLDER_WRITE_YOUR_MESSAGE": "Vaše zpráva zde...", "BTN_SEND": "Odeslat", - "LINKS_TITLE": "Useful links", + "LINKS_TITLE": "Užitečné odkazy", "ERROR_INVALID_EMAIL": "@:MSG_ERROR_POST_API_AUTH_SIGNUP_40000_EMAIL", "ERROR_INVALID_MESSAEG": "Chybí text zprávy.", "MSG_REQUEST_SENT": "Vaše žádost o pomoc byla odeslána!", @@ -119,24 +119,24 @@ }, "ADD_IDEA": { "FOOTER_MENU_TITLE": "Připojte se ke shromáždění nápadů", - "FOOTER_FORM_ANONYMOUS_INFO": "You are posting anonymously", + "FOOTER_FORM_ANONYMOUS_INFO": "Odesíláte anonymně", "FOOTER_MENU_BTN_ADD_IDEA": "Přidejte svůj nápad", - "TOOLTIP_ANONYMOUS_TITLE": "Anonymous posting", - "TOOLTIP_ANONYMOUS_DESCRIPTION": "Your idea will be posted anonymously. There will be no way to identify you.", + "TOOLTIP_ANONYMOUS_TITLE": "Anonymní příspěvek", + "TOOLTIP_ANONYMOUS_DESCRIPTION": "Tvůj nápad bude zveřejněn anonymně. Nebude žádný způsob, jak tě identifikovat.", "FOOTER_FORM_TITLE": "Přidejte svůj nápad", - "PLACEHOLDER_ADD_STATEMENT_TO_IDEA": "Your idea heading", + "PLACEHOLDER_ADD_STATEMENT_TO_IDEA": "Tvůj nápad", "SUBJECT_CHARACTERS_LEFT": "Zbývající znaky: {{chars}}/{{charsLeft}}", "IDEA_TYPE_CHARACTER_LIMIT": "Limit znaků: {{numberOfCharacters}}", "IDEA_TYPE_CHARACTERS_LEFT": "@:COMPONENTS.ADD_IDEA.SUBJECT_CHARACTERS_LEFT", "CHARACTER_LIMIT": "@:COMPONENTS.GROUP_INVITE.CHARACTER_LIMIT", "PLACEHOLDER_EXPLAIN_YOUR_IDEA": "Vysvětlete svůj nápad", - "BTN_ADD_IMAGE": "Add image", + "BTN_ADD_IMAGE": "Přidat obrázek", "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT", - "BTN_DELETE_DRAFT": "Delete draft", - "BTN_IDEA_POST": "Add your idea", - "BTN_EXPAND": "Expand", - "BTN_COLLAPSE": "Collapse", - "MSG_SUCCESS": "Idea successfully posted", + "BTN_DELETE_DRAFT": "Smazat koncept", + "BTN_IDEA_POST": "Přidejte svůj nápad", + "BTN_EXPAND": "Rozbalit", + "BTN_COLLAPSE": "Sbalit", + "MSG_SUCCESS": "Nápad byl úspěšně odeslán", "MSG_ERROR_SUBJECT": "Idea heading must be 1 to {{chars}} characters long.", "FIELD_IS_MANDATORY": "Field is mandatory", "RESIDENCE_VALUE_PREFIX": "Other: ", @@ -306,9 +306,9 @@ "MESSAGE_DESCRIPTION": "Are you sure you want to download the voting results? This will mean the vote is permanently closed.", "MESSAGE_OPTIONS": "Zde jsou některé možnosti:", "HEADING_NOT_DOWNLOAD": "Prodloužit termín hlasování", - "UPDATE_DEADLINE": "Change the deadline to try and collect more votes. This will keep the vote open, so you won't yet see the results.", + "UPDATE_DEADLINE": "Změňte termín, abyste se pokusili shromáždit více hlasů. To ponechá hlasování otevřené, takže ještě neuvidíte výsledky.", "HEADING_DOWNLOAD": "Stáhnout výsledky", - "GET_RESULTS": "The vote will be permanently closed.", + "GET_RESULTS": "Hlasování bude trvale ukončeno.", "FOLLOW_UP": "The topic will be moved into the 'Action' phase, so you can post plans and updates for actions taken as a result of the vote.", "BTN_EDIT_DEADLINE": "Upravit termín hlasování", "BTN_CANCEL": "Nestahovat výsledky", @@ -327,12 +327,12 @@ "DEADLINE_TIME_OPTION_AM": "@:COMPONENTS.EDIT_IDEATION_DEADLINE.DEADLINE_TIME_OPTION_AM", "DEADLINE_TIME_OPTION_PM": "@:COMPONENTS.EDIT_IDEATION_DEADLINE.DEADLINE_TIME_OPTION_PM", "LBL_TIMEZONE": "@:COMPONENTS.EDIT_IDEATION_DEADLINE.LBL_TIMEZONE", - "DEADLINE_LBL_TIMEZONE": "Timezone", + "DEADLINE_LBL_TIMEZONE": "Časové pásmo", "LNK_CANCEL": "@:LNK_CANCEL", "BTN_SAVE": "@:DIRECTIVES.COS_MODAL.BTN_SAVE" }, "EDIT_IDEATION_DEADLINE": { - "LBL_DEADLINE": "Idea gathering deadline", + "LBL_DEADLINE": "Termín pro shromáždění nápadů", "DIALOG_HEADING": "Edit idea gathering deadline", "DIALOG_HEADING_ADD": "Add idea gathering deadline", "LBL_EDIT_IDEATION_DEADLINE": "Edit idea gathering deadline", @@ -342,14 +342,14 @@ "LBL_OPTION_DEADLINE_DESC": "When the set date is reached, the idea gathering is closed.", "DEADLINE_LBL_TIME": "Time", "DEADLINE_TIME_OPTION_24": "24h clock", - "DEADLINE_TIME_OPTION_AM": "AM", - "DEADLINE_TIME_OPTION_PM": "PM", - "DEADLINE_LBL_TIMEZONE": "Timezone", + "DEADLINE_TIME_OPTION_AM": "dop.", + "DEADLINE_TIME_OPTION_PM": "odp", + "DEADLINE_LBL_TIMEZONE": "Časové pásmo", "LNK_CANCEL": "@:LNK_CANCEL", "BTN_SAVE": "@:DIRECTIVES.COS_MODAL.BTN_SAVE" }, "EDIT_IDEA": { - "FOOTER_FORM_TITLE": "Edit idea", + "FOOTER_FORM_TITLE": "Upravit nápad", "FOOTER_FORM_ANONYMOUS_INFO": "@:COMPONENTS.ADD_IDEA.FOOTER_FORM_ANONYMOUS_INFO", "TOOLTIP_ANONYMOUS_TITLE": "@:COMPONENTS.ADD_IDEA.TOOLTIP_ANONYMOUS_TITLE", "TOOLTIP_ANONYMOUS_DESCRIPTION": "@:COMPONENTS.ADD_IDEA.TOOLTIP_ANONYMOUS_DESCRIPTION", @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index da831ff7a..739f611e7 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Ordner löschen", "BTN_CREATE_NEW_FOLDER": "Neuen Ordner erstellen", "NO_FOLDERS_HEADING": "Es sind noch keine Ideenordner vorhanden", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Themenadministratoren können Ordner erstellen, um Ideen zu gruppieren, die in dieselbe Kategorie passen." }, diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 7847bbb86..40f8ef0aa 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Eliminar carpeta", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json index 093e6397f..c7ad4f308 100644 --- a/src/assets/i18n/et.json +++ b/src/assets/i18n/et.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Kustuta kaust", "BTN_CREATE_NEW_FOLDER": "Loo uus kaust", "NO_FOLDERS_HEADING": "Ideekaustad puuduvad", + "ITEMS_FOUND_WITH_FILTERS": "Nende filtritega leitud ideed: {{count}}", "NO_ITEMS_FOUND": "Nende filtritega ei leitud tulemusi. Proovige filtreid kohandada ja otsige uuesti.", "NO_FOLDERS_DESC": "Teemade administraatorid saavad luua kaustu samasse kategooriasse sobivate ideede rühmitamiseks." }, diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 2c2687a8f..dbbd1d58e 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/id.json b/src/assets/i18n/id.json index 8adfb8c4a..25e58db78 100644 --- a/src/assets/i18n/id.json +++ b/src/assets/i18n/id.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json index e5853792b..e99b43070 100644 --- a/src/assets/i18n/nl.json +++ b/src/assets/i18n/nl.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 251bce24b..060d02d7c 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Удалить папку", "BTN_CREATE_NEW_FOLDER": "Создать новую папку", "NO_FOLDERS_HEADING": "Папки с идеями отсутствуют", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "По Вашему запросу ничего не найдено. Попробуйте изменить фильтры и повторить поиск.", "NO_FOLDERS_DESC": "Администраторы темы могут создавать папки для группировки идей, относящихся к одной категории." }, diff --git a/src/assets/i18n/sk.json b/src/assets/i18n/sk.json index ecf0ff631..e6f455421 100644 --- a/src/assets/i18n/sk.json +++ b/src/assets/i18n/sk.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Odstrániť priečinok", "BTN_CREATE_NEW_FOLDER": "Vytvoriť nový priečinok", "NO_FOLDERS_HEADING": "Zatiaľ žiadne priečinky nápadov", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Admini témy môžu vytvárať priečinky, kde sa zoskupia nápady spadajúce do rovnakej kategórie." }, diff --git a/src/assets/i18n/so.json b/src/assets/i18n/so.json index 20e4abee6..3b1c8c3f0 100644 --- a/src/assets/i18n/so.json +++ b/src/assets/i18n/so.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/sq.json b/src/assets/i18n/sq.json index 04c41e38d..d641ea7ab 100644 --- a/src/assets/i18n/sq.json +++ b/src/assets/i18n/sq.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/sw.json b/src/assets/i18n/sw.json index 20e4abee6..3b1c8c3f0 100644 --- a/src/assets/i18n/sw.json +++ b/src/assets/i18n/sw.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 7e6a432d5..863bfc123 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -818,6 +818,7 @@ "OPTION_DELETE_FOLDER": "Delete folder", "BTN_CREATE_NEW_FOLDER": "Create new folder", "NO_FOLDERS_HEADING": "There are no idea folders yet", + "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.", "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category." }, From ca4f9e7c7112b7ec207ca2ce782b02c06de40ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Thu, 17 Jul 2025 18:19:42 +0300 Subject: [PATCH 6/6] New translations en.json (Russian) (#2350) --- src/assets/i18n/ru.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 060d02d7c..3788efdfa 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -134,8 +134,8 @@ "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT", "BTN_DELETE_DRAFT": "Удалить черновик", "BTN_IDEA_POST": "Добавить свою идею", - "BTN_EXPAND": "Expand", - "BTN_COLLAPSE": "Collapse", + "BTN_EXPAND": "Раскрыть", + "BTN_COLLAPSE": "Свернуть", "MSG_SUCCESS": "Идея успешно опубликована", "MSG_ERROR_SUBJECT": "Заголовок идеи должен быть длиной от 1 до {{chars}} символов.", "FIELD_IS_MANDATORY": "Поле является обязательным", @@ -818,7 +818,7 @@ "OPTION_DELETE_FOLDER": "Удалить папку", "BTN_CREATE_NEW_FOLDER": "Создать новую папку", "NO_FOLDERS_HEADING": "Папки с идеями отсутствуют", - "ITEMS_FOUND_WITH_FILTERS": "Ideas found with these filters: {{count}}", + "ITEMS_FOUND_WITH_FILTERS": "Идеи найденные с данными фильтрами: {{count}}", "NO_ITEMS_FOUND": "По Вашему запросу ничего не найдено. Попробуйте изменить фильтры и повторить поиск.", "NO_FOLDERS_DESC": "Администраторы темы могут создавать папки для группировки идей, относящихся к одной категории." },