From 6cb097e011372c79b893d57306de8bdcdbe93584 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Mon, 28 Oct 2024 17:45:37 +0300 Subject: [PATCH 01/55] Correct type --- .../app/components/admin/DatePickers/DatePhasePicker/typings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/typings.ts b/front/app/components/admin/DatePickers/DatePhasePicker/typings.ts index 58d3b0713fbe..0c6e29a30f40 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/typings.ts +++ b/front/app/components/admin/DatePickers/DatePhasePicker/typings.ts @@ -14,5 +14,5 @@ export interface Props { startMonth?: Date; endMonth?: Date; defaultMonth?: Date; - onUpdateRange: (range: DateRange) => void; + onUpdateRange: (range: Partial) => void; } From 9a3f5f56d41b8d0175489610c88ecfef47d1c207 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Mon, 28 Oct 2024 17:45:59 +0300 Subject: [PATCH 02/55] Remove unnecessary condition --- .../admin/DatePickers/DatePhasePicker/Calendar/index.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx index 94a6a1540219..788bc37c82c7 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx +++ b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx @@ -188,11 +188,7 @@ const Calendar = ({ clickedDate: day, }); - // TODO: Fix this the next time the file is edited. - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - if (updatedRange) { - onUpdateRange(updatedRange); - } + onUpdateRange(updatedRange); }; return ( From 2830826b20ed81fcbd23ececd758d529457e337f Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Mon, 28 Oct 2024 17:46:23 +0300 Subject: [PATCH 03/55] Change get start month to allow months ten years from now --- .../DatePhasePicker/Calendar/utils/getStartEndMonth.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts index f31ea14e6cc8..31f40f8733e2 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts +++ b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts @@ -17,7 +17,7 @@ export const getStartMonth = ({ }: GetStartMonthProps) => { if (startMonth) return startMonth; - const times: number[] = [addYears(new Date(), -2).getTime()]; + const times: number[] = [addYears(new Date(), -10).getTime()]; if (selectedRange.from) { times.push(addYears(selectedRange.from, -2).getTime()); @@ -49,7 +49,7 @@ export const getEndMonth = ({ }: GetEndMonthProps) => { if (endMonth) return endMonth; - const times: number[] = [addYears(new Date(), 2).getTime()]; + const times: number[] = [addYears(new Date(), 10).getTime()]; if (selectedRange.to) { times.push(addYears(selectedRange.to, 2).getTime()); From 2ee3cd44b8f84a5b96eb763ecedd9a6e110f8500 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Mon, 28 Oct 2024 17:46:52 +0300 Subject: [PATCH 04/55] Set return type --- .../DatePhasePicker/Calendar/utils/getUpdatedRange.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getUpdatedRange.ts b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getUpdatedRange.ts index f59bbb23b3e7..5dc82c13d11a 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getUpdatedRange.ts +++ b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getUpdatedRange.ts @@ -15,7 +15,7 @@ export const getUpdatedRange = ({ selectedRange: { from, to }, disabledRanges, clickedDate, -}: GetUpdatedRangeParams) => { +}: GetUpdatedRangeParams): Partial => { const { valid, reason } = rangesValid({ from, to }, disabledRanges); if (!valid) { From d4975a4bdd3a577ec1edc449adbe79108e50d9f1 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Mon, 28 Oct 2024 19:18:01 +0300 Subject: [PATCH 05/55] Fix timezone issue in phase dates --- .../DatePhasePicker/Calendar/index.tsx | 6 ++++++ .../project/phaseSetup/components/DateSetup.tsx | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx index 788bc37c82c7..5e64966c2f99 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx +++ b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/index.tsx @@ -6,6 +6,8 @@ import { transparentize } from 'polished'; import { DayPicker, PropsBase } from 'react-day-picker'; import styled from 'styled-components'; +import useAppConfiguration from 'api/app_configuration/useAppConfiguration'; + import useLocale from 'hooks/useLocale'; import { getLocale } from '../../_shared/locales'; @@ -144,6 +146,9 @@ const Calendar = ({ defaultMonth, onUpdateRange, }: Props) => { + const { data: appConfiguration } = useAppConfiguration(); + const tenantTimezone = + appConfiguration?.data.attributes.settings.core.timezone; const startMonth = getStartMonth({ startMonth: _startMonth, selectedRange, @@ -209,6 +214,7 @@ const Calendar = ({ // range rather than being controlled by our state. selected={[] as any} onSelect={NOOP} + timeZone={tenantTimezone} /> ); diff --git a/front/app/containers/Admin/projects/project/phaseSetup/components/DateSetup.tsx b/front/app/containers/Admin/projects/project/phaseSetup/components/DateSetup.tsx index afec23d4e312..a758f2d1b90e 100644 --- a/front/app/containers/Admin/projects/project/phaseSetup/components/DateSetup.tsx +++ b/front/app/containers/Admin/projects/project/phaseSetup/components/DateSetup.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from 'react'; import { Box } from '@citizenlab/cl2-component-library'; -import { format } from 'date-fns'; +import { format, parseISO, startOfDay } from 'date-fns'; import { useParams } from 'react-router-dom'; import { CLErrors } from 'typings'; @@ -45,13 +45,12 @@ const DateSetup = ({ const { start_at, end_at } = formData; - const selectedRange = useMemo( - () => ({ - from: start_at ? new Date(start_at) : undefined, - to: end_at ? new Date(end_at) : undefined, - }), - [start_at, end_at] - ); + const selectedRange = useMemo(() => { + return { + from: start_at ? startOfDay(parseISO(start_at)) : undefined, + to: end_at ? startOfDay(parseISO(end_at)) : undefined, + }; + }, [start_at, end_at]); const disabledRanges = useMemo(() => { if (!phases) return undefined; From f6b3bc7825f99b2717cd9937c31e4e3a301caf50 Mon Sep 17 00:00:00 2001 From: jamesspeake Date: Tue, 29 Oct 2024 12:18:33 +0000 Subject: [PATCH 06/55] [TAN-2894] Allow ALL automated emails to be disabled --- .../app/models/concerns/email_campaigns/disableable.rb | 3 +++ .../email_campaigns/campaigns/comment_on_idea_you_follow.rb | 1 + .../campaigns/comment_on_initiative_you_follow.rb | 1 + .../campaigns/official_feedback_on_idea_you_follow.rb | 1 + .../campaigns/official_feedback_on_initiative_you_follow.rb | 1 + .../app/models/email_campaigns/campaigns/project_published.rb | 1 + .../campaigns/status_change_on_idea_you_follow.rb | 1 + .../campaigns/status_change_on_initiative_you_follow.rb | 1 + 8 files changed, 10 insertions(+) diff --git a/back/engines/free/email_campaigns/app/models/concerns/email_campaigns/disableable.rb b/back/engines/free/email_campaigns/app/models/concerns/email_campaigns/disableable.rb index 0b660b3a3166..639acda2585a 100644 --- a/back/engines/free/email_campaigns/app/models/concerns/email_campaigns/disableable.rb +++ b/back/engines/free/email_campaigns/app/models/concerns/email_campaigns/disableable.rb @@ -4,6 +4,9 @@ module EmailCampaigns module Disableable extend ActiveSupport::Concern + # NOTE: This concern is now applied to all campaigns + # but is left here so that future campaigns have the ability to not be disabled + # If one instance is enabled, we consider the campaign_type enabled. This # returns all campaign_types that are not all disabled def self.enabled_campaign_types(instances) diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_idea_you_follow.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_idea_you_follow.rb index 260e8810729f..aec899b05716 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_idea_you_follow.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_idea_you_follow.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::CommentOnIdeaYouFollow < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include LifecycleStageRestrictable diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_initiative_you_follow.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_initiative_you_follow.rb index abd89837843e..c10b7a3d45c3 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_initiative_you_follow.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_initiative_you_follow.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::CommentOnInitiativeYouFollow < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include LifecycleStageRestrictable diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_idea_you_follow.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_idea_you_follow.rb index 5297ae209035..a0331096ef81 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_idea_you_follow.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_idea_you_follow.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::OfficialFeedbackOnIdeaYouFollow < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include Trackable diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_initiative_you_follow.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_initiative_you_follow.rb index 6f7fff6ae5eb..eeb2878f80ea 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_initiative_you_follow.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_initiative_you_follow.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::OfficialFeedbackOnInitiativeYouFollow < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include Trackable diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/project_published.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/project_published.rb index 96e406709465..9d4d40d084b5 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/project_published.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/project_published.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::ProjectPublished < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include Trackable diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_idea_you_follow.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_idea_you_follow.rb index 1fca100fac5c..3f2be3767737 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_idea_you_follow.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_idea_you_follow.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::StatusChangeOnIdeaYouFollow < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include Trackable diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_initiative_you_follow.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_initiative_you_follow.rb index c324af9290f5..514573af0cad 100644 --- a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_initiative_you_follow.rb +++ b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/status_change_on_initiative_you_follow.rb @@ -31,6 +31,7 @@ module EmailCampaigns class Campaigns::StatusChangeOnInitiativeYouFollow < Campaign include Consentable + include Disableable include ActivityTriggerable include RecipientConfigurable include Trackable From 34bffb3aa1e56e51fbee24a533ae83bc191767a6 Mon Sep 17 00:00:00 2001 From: jamesspeake Date: Tue, 29 Oct 2024 17:35:21 +0000 Subject: [PATCH 07/55] [TAN-2917] Do not try and update fields and options when nothing has changed --- .../web_api/v1/admin/idea_custom_fields_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/back/engines/commercial/idea_custom_fields/app/controllers/idea_custom_fields/web_api/v1/admin/idea_custom_fields_controller.rb b/back/engines/commercial/idea_custom_fields/app/controllers/idea_custom_fields/web_api/v1/admin/idea_custom_fields_controller.rb index 1ac116b79dfc..c73a81ada151 100644 --- a/back/engines/commercial/idea_custom_fields/app/controllers/idea_custom_fields/web_api/v1/admin/idea_custom_fields_controller.rb +++ b/back/engines/commercial/idea_custom_fields/app/controllers/idea_custom_fields/web_api/v1/admin/idea_custom_fields_controller.rb @@ -110,7 +110,7 @@ def update_fields!(page_temp_ids_to_ids_mapping, option_temp_ids_to_ids_mapping, options_params = field_params.delete :options if field_params[:id] && fields_by_id.key?(field_params[:id]) field = fields_by_id[field_params[:id]] - next unless update_field! field, field_params, errors, index + next unless update_field!(field, field_params, errors, index) else field = create_field! field_params, errors, page_temp_ids_to_ids_mapping, index next unless field @@ -164,6 +164,8 @@ def update_field!(field, field_params, errors, index) field_params = idea_custom_field_service.remove_ignored_update_params field_params if field.errors.errors.empty? field.assign_attributes field_params + return true unless field.changed? + SideFxCustomFieldService.new.before_update field, current_user if field.save SideFxCustomFieldService.new.after_update field, current_user @@ -248,6 +250,7 @@ def update_option_image!(option, image_id) def update_option!(option, option_params, errors, field_index, option_index) update_params = option_params.except('image_id') option.assign_attributes update_params + return true unless option.changed? SideFxCustomFieldOptionService.new.before_update option, current_user if option.save From 78721217224c9a6a92ba8da1964f787c57693f3c Mon Sep 17 00:00:00 2001 From: jamesspeake Date: Tue, 29 Oct 2024 18:42:01 +0000 Subject: [PATCH 08/55] [TAN-2917] Added a test --- .../update_all_native_survey_spec.rb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb b/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb index da9bb7284c8d..bfb0698e83a9 100644 --- a/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb +++ b/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb @@ -3160,6 +3160,31 @@ assert_status 200 end + example 'Updating fields only logs activities when they have changed' do + page = create(:custom_field_page, resource: custom_form) + field1 = create(:custom_field, resource: custom_form, title_multiloc: { 'en' => 'Field 1' }) + field2 = create(:custom_field, resource: custom_form, title_multiloc: { 'en' => 'Field 2' }) + request = { + custom_fields: [ + { + id: page.id, + input_type: 'page', + page_layout: 'default' + }, + { + id: field1.id, + title_multiloc: { 'en' => 'Field 1' } + }, + { + id: field2.id, + title_multiloc: { 'en' => 'Field 2 changed' } + } + ] + } + + expect{do_request(request)}.to enqueue_job(LogActivityJob).exactly(1).times + end + context "Update custom field's map config relation" do let!(:map_config1) { create(:map_config, mappable: nil) } let!(:map_config2) { create(:map_config, mappable: nil) } From b95fd241269bb01075f769bfcc97a8f6267a1618 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 30 Oct 2024 10:30:15 +0300 Subject: [PATCH 09/55] Don't render is string empty --- front/app/components/T/index.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/front/app/components/T/index.tsx b/front/app/components/T/index.tsx index aaabcc8e4d26..d3d682285ea9 100644 --- a/front/app/components/T/index.tsx +++ b/front/app/components/T/index.tsx @@ -1,5 +1,6 @@ import React, { createElement } from 'react'; +import { trim } from 'lodash-es'; import { Multiloc } from 'typings'; import useAppConfigurationLocales from 'hooks/useAppConfigurationLocales'; @@ -54,6 +55,10 @@ const T = (props: Props) => { fallback ); + if (trim(localizedText) === '') { + return null; + } + if (children) { return children(localizedText); } From 280d28a5392e17d08e2270d5ae6e21a24696b83c Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 30 Oct 2024 10:46:03 +0300 Subject: [PATCH 10/55] Allow no logo --- .../Admin/settings/customize/Branding.tsx | 10 +----- .../Admin/settings/customize/index.tsx | 33 +++---------------- .../Admin/settings/customize/messages.ts | 4 --- 3 files changed, 5 insertions(+), 42 deletions(-) diff --git a/front/app/containers/Admin/settings/customize/Branding.tsx b/front/app/containers/Admin/settings/customize/Branding.tsx index 90a81f4c7c79..782a6e5ed751 100644 --- a/front/app/containers/Admin/settings/customize/Branding.tsx +++ b/front/app/containers/Admin/settings/customize/Branding.tsx @@ -30,7 +30,6 @@ const ContrastWarning = styled(Warning)` interface Props { logo: UploadFile[] | null; - logoError: string | null; setAttributesDiff: (state: any) => void; getSetting: (setting: string) => any; setLogo: (logo: UploadFile[] | null) => void; @@ -56,13 +55,7 @@ const TENANT_COLORS: TenantColor[] = [ 'color_text', ]; -export default ({ - logo, - logoError, - setAttributesDiff, - getSetting, - setLogo, -}: Props) => { +export default ({ logo, setAttributesDiff, getSetting, setLogo }: Props) => { const [contrastRatios, setContrastRatios] = useState({ color_main: null, color_secondary: null, @@ -214,7 +207,6 @@ export default ({ objectFit="contain" onAdd={handleLogoOnAdd} onRemove={handleLogoOnRemove} - errorMessage={logoError} /> diff --git a/front/app/containers/Admin/settings/customize/index.tsx b/front/app/containers/Admin/settings/customize/index.tsx index 0599833aa936..8439fc702dc1 100644 --- a/front/app/containers/Admin/settings/customize/index.tsx +++ b/front/app/containers/Admin/settings/customize/index.tsx @@ -1,12 +1,11 @@ import React, { useState, useEffect } from 'react'; -import { get, has, isEmpty, omitBy } from 'lodash-es'; +import { get, isEmpty, omitBy } from 'lodash-es'; import styled from 'styled-components'; import { UploadFile, Multiloc } from 'typings'; import { IAppConfigurationStyle, - IAppConfiguration, IAppConfigurationSettings, } from 'api/app_configuration/types'; import useAppConfiguration from 'api/app_configuration/useAppConfiguration'; @@ -17,7 +16,6 @@ import useLocale from 'hooks/useLocale'; import { Section, SectionTitle } from 'components/admin/Section'; import SubmitWrapper from 'components/admin/SubmitWrapper'; -import { useIntl } from 'utils/cl-intl'; import { convertUrlToUploadFile } from 'utils/fileUtils'; import { isNilOrError } from 'utils/helperUtils'; @@ -25,7 +23,6 @@ import sharedSettingsMessages from '../messages'; import Branding from './Branding'; import getSubmitState from './getSubmitState'; -import messages from './messages'; export interface IAttributesDiff { settings?: Partial; @@ -43,13 +40,10 @@ export const StyledSectionTitle = styled(SectionTitle)` const SettingsCustomizeTab = () => { const [logo, setLogo] = useState(null); - const [logoError, setLogoError] = useState(null); const [attributesDiff, setAttributesDiff] = useState({}); const [titleError, setTitleError] = useState({}); const [subtitleError, setSubtitleError] = useState({}); - const { formatMessage } = useIntl(); - const locale = useLocale(); const { data: appConfiguration } = useAppConfiguration(); const { @@ -71,37 +65,19 @@ const SettingsCustomizeTab = () => { } }, [appConfiguration]); - const validate = ( - tenant: IAppConfiguration, - attributesDiff: IAttributesDiff - ) => { - const hasRemoteLogo = has(tenant, 'data.attributes.logo.large'); - const localLogoIsNotSet = !has(attributesDiff, 'logo'); - // TODO: Fix this the next time the file is edited. - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - const localLogoIsNull = !localLogoIsNotSet && attributesDiff.logo === null; - const logoError = - // TODO: Fix this the next time the file is edited. - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - !localLogoIsNull || (hasRemoteLogo && localLogoIsNotSet) - ? null - : formatMessage(messages.noLogo); + const validate = () => { const hasTitleError = !isEmpty(omitBy(titleError, isEmpty)); const hasSubtitleError = !isEmpty(omitBy(subtitleError, isEmpty)); - setLogoError(logoError); setTitleError(titleError); setSubtitleError(subtitleError); - return !logoError && !hasTitleError && !hasSubtitleError; + return !hasTitleError && !hasSubtitleError; }; const save = async (event: React.FormEvent) => { event.preventDefault(); - if ( - !isNilOrError(appConfiguration) && - validate(appConfiguration, attributesDiff) - ) { + if (!isNilOrError(appConfiguration) && validate()) { if (!isEmpty(attributesDiff)) { updateAppConfiguration(attributesDiff, { onSuccess: () => { @@ -126,7 +102,6 @@ const SettingsCustomizeTab = () => {
Date: Wed, 30 Oct 2024 07:49:05 +0000 Subject: [PATCH 11/55] Translations updated by CI (extract-intl) --- front/app/translations/admin/ar-MA.json | 1 - front/app/translations/admin/ar-SA.json | 1 - front/app/translations/admin/ca-ES.json | 1 - front/app/translations/admin/cy-GB.json | 1 - front/app/translations/admin/da-DK.json | 1 - front/app/translations/admin/de-DE.json | 1 - front/app/translations/admin/el-GR.json | 1 - front/app/translations/admin/en-CA.json | 1 - front/app/translations/admin/en-GB.json | 1 - front/app/translations/admin/en-IE.json | 1 - front/app/translations/admin/en.json | 1 - front/app/translations/admin/es-CL.json | 1 - front/app/translations/admin/es-ES.json | 1 - front/app/translations/admin/fi-FI.json | 1 - front/app/translations/admin/fr-BE.json | 1 - front/app/translations/admin/fr-FR.json | 1 - front/app/translations/admin/hr-HR.json | 1 - front/app/translations/admin/hu-HU.json | 1 - front/app/translations/admin/it-IT.json | 1 - front/app/translations/admin/kl-GL.json | 1 - front/app/translations/admin/lb-LU.json | 1 - front/app/translations/admin/lv-LV.json | 1 - front/app/translations/admin/mi.json | 1 - front/app/translations/admin/nb-NO.json | 1 - front/app/translations/admin/nl-BE.json | 1 - front/app/translations/admin/nl-NL.json | 1 - front/app/translations/admin/pa-IN.json | 1 - front/app/translations/admin/pl-PL.json | 1 - front/app/translations/admin/pt-BR.json | 1 - front/app/translations/admin/ro-RO.json | 1 - front/app/translations/admin/sr-Latn.json | 1 - front/app/translations/admin/sr-SP.json | 1 - front/app/translations/admin/sv-SE.json | 1 - front/app/translations/admin/tr-TR.json | 1 - front/app/translations/admin/ur-PK.json | 1 - 35 files changed, 35 deletions(-) diff --git a/front/app/translations/admin/ar-MA.json b/front/app/translations/admin/ar-MA.json index 85192e663e02..aded22371505 100644 --- a/front/app/translations/admin/ar-MA.json +++ b/front/app/translations/admin/ar-MA.json @@ -1015,7 +1015,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "النشاط", "app.containers.AdminPage.SettingsPage.logo": "الشعار", "app.containers.AdminPage.SettingsPage.noHeader": "يُرجى تحميل صورة للترويسة", - "app.containers.AdminPage.SettingsPage.noLogo": "يُرجى تحميل شعار", "app.containers.AdminPage.SettingsPage.no_button": "لا يوجد زر", "app.containers.AdminPage.SettingsPage.organizationName": "اسم المدينة أو المؤسسة", "app.containers.AdminPage.SettingsPage.overlayToggleLabel": "تمكين التداخل", diff --git a/front/app/translations/admin/ar-SA.json b/front/app/translations/admin/ar-SA.json index 8fea2150c4a2..2f0bf3141d5f 100644 --- a/front/app/translations/admin/ar-SA.json +++ b/front/app/translations/admin/ar-SA.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "النشاط", "app.containers.AdminPage.SettingsPage.logo": "الشعار", "app.containers.AdminPage.SettingsPage.noHeader": "يُرجى تحميل صورة للترويسة", - "app.containers.AdminPage.SettingsPage.noLogo": "يُرجى تحميل شعار", "app.containers.AdminPage.SettingsPage.no_button": "لا يوجد زر", "app.containers.AdminPage.SettingsPage.organizationName": "اسم المدينة أو المؤسسة", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "أدخل اسم منظمة أو مدينة لجميع اللغات.", diff --git a/front/app/translations/admin/ca-ES.json b/front/app/translations/admin/ca-ES.json index 239ab49f80f2..cf9f3307492d 100644 --- a/front/app/translations/admin/ca-ES.json +++ b/front/app/translations/admin/ca-ES.json @@ -1314,7 +1314,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logotip", "app.containers.AdminPage.SettingsPage.noHeader": "Pengeu una imatge de capçalera (1440 x 480 px)", - "app.containers.AdminPage.SettingsPage.noLogo": "Si us plau, carregueu un logotip", "app.containers.AdminPage.SettingsPage.no_button": "Cap botó", "app.containers.AdminPage.SettingsPage.organizationName": "Nom de la ciutat o organització", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/cy-GB.json b/front/app/translations/admin/cy-GB.json index beccfde10cbe..e14030c9295f 100644 --- a/front/app/translations/admin/cy-GB.json +++ b/front/app/translations/admin/cy-GB.json @@ -1991,7 +1991,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Gweithgaredd", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Uwchlwythwch ddelwedd pennawd", - "app.containers.AdminPage.SettingsPage.noLogo": "Llwythwch i fyny logo", "app.containers.AdminPage.SettingsPage.no_button": "Dim botwm", "app.containers.AdminPage.SettingsPage.organizationName": "Enw'r ddinas neu'r sefydliad", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Darparwch enw sefydliad neu ddinas ar gyfer pob iaith.", diff --git a/front/app/translations/admin/da-DK.json b/front/app/translations/admin/da-DK.json index 305d58c0d3c4..7bcf17f316c6 100644 --- a/front/app/translations/admin/da-DK.json +++ b/front/app/translations/admin/da-DK.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Aktivitet", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Upload venligst et header-billede", - "app.containers.AdminPage.SettingsPage.noLogo": "Upload venligst et logo", "app.containers.AdminPage.SettingsPage.no_button": "Ingen knap", "app.containers.AdminPage.SettingsPage.organizationName": "Navn på by eller organisation", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Angiv et organisationsnavn eller en by for alle sprog.", diff --git a/front/app/translations/admin/de-DE.json b/front/app/translations/admin/de-DE.json index 19028af37fc2..17339cf62971 100644 --- a/front/app/translations/admin/de-DE.json +++ b/front/app/translations/admin/de-DE.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Teilnahme-Feed", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Bitte lade ein Kopfzeilenbild hoch", - "app.containers.AdminPage.SettingsPage.noLogo": "Bitte laden Sie ein Logo hoch", "app.containers.AdminPage.SettingsPage.no_button": "Kein Button", "app.containers.AdminPage.SettingsPage.organizationName": "Name der Stadt oder Organisation", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Geben Sie für alle Sprachen einen Organisationsnamen oder eine Stadt an.", diff --git a/front/app/translations/admin/el-GR.json b/front/app/translations/admin/el-GR.json index 17d46163e5d3..2bda05bdbac0 100644 --- a/front/app/translations/admin/el-GR.json +++ b/front/app/translations/admin/el-GR.json @@ -1314,7 +1314,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Λογότυπο", "app.containers.AdminPage.SettingsPage.noHeader": "Παρακαλούμε ανεβάστε μια εικόνα κεφαλίδας (1440 x 480 px)", - "app.containers.AdminPage.SettingsPage.noLogo": "Παρακαλούμε ανεβάστε ένα λογότυπο", "app.containers.AdminPage.SettingsPage.no_button": "Δεν υπάρχει κουμπί", "app.containers.AdminPage.SettingsPage.organizationName": "Όνομα πόλης ή οργανισμού", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/en-CA.json b/front/app/translations/admin/en-CA.json index b8b3efe30768..a36c48d2da73 100644 --- a/front/app/translations/admin/en-CA.json +++ b/front/app/translations/admin/en-CA.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/en-GB.json b/front/app/translations/admin/en-GB.json index 204e62435f2f..6a5bb69c7ab4 100644 --- a/front/app/translations/admin/en-GB.json +++ b/front/app/translations/admin/en-GB.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "City or organisation name", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/en-IE.json b/front/app/translations/admin/en-IE.json index b8b3efe30768..a36c48d2da73 100644 --- a/front/app/translations/admin/en-IE.json +++ b/front/app/translations/admin/en-IE.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/en.json b/front/app/translations/admin/en.json index b8b3efe30768..a36c48d2da73 100644 --- a/front/app/translations/admin/en.json +++ b/front/app/translations/admin/en.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/es-CL.json b/front/app/translations/admin/es-CL.json index bdcc0b8f5bfa..13a06d6fdec8 100644 --- a/front/app/translations/admin/es-CL.json +++ b/front/app/translations/admin/es-CL.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Actividad", "app.containers.AdminPage.SettingsPage.logo": "Logotipo", "app.containers.AdminPage.SettingsPage.noHeader": "Por favor, sube una imagen de encabezado", - "app.containers.AdminPage.SettingsPage.noLogo": "Por favor subir un logo", "app.containers.AdminPage.SettingsPage.no_button": "Sin botón", "app.containers.AdminPage.SettingsPage.organizationName": "Organización o Municipalidad nombre", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Indique el nombre de la organización o la ciudad para todas las lenguas.", diff --git a/front/app/translations/admin/es-ES.json b/front/app/translations/admin/es-ES.json index b9843f43bc1d..13cbf33f47b4 100644 --- a/front/app/translations/admin/es-ES.json +++ b/front/app/translations/admin/es-ES.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Actividad", "app.containers.AdminPage.SettingsPage.logo": "Logotipo", "app.containers.AdminPage.SettingsPage.noHeader": "Por favor, sube una imagen de encabezado", - "app.containers.AdminPage.SettingsPage.noLogo": "Por favor subir un logo", "app.containers.AdminPage.SettingsPage.no_button": "Sin botón", "app.containers.AdminPage.SettingsPage.organizationName": "Organización o Municipalidad nombre", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Indique el nombre de la organización o la ciudad para todas las lenguas.", diff --git a/front/app/translations/admin/fi-FI.json b/front/app/translations/admin/fi-FI.json index be29a126c837..8c8f576174f6 100644 --- a/front/app/translations/admin/fi-FI.json +++ b/front/app/translations/admin/fi-FI.json @@ -1991,7 +1991,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Toiminta", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Lähetä otsikkokuva", - "app.containers.AdminPage.SettingsPage.noLogo": "Lataa logo", "app.containers.AdminPage.SettingsPage.no_button": "Ei painiketta", "app.containers.AdminPage.SettingsPage.organizationName": "Kaupungin tai organisaation nimi", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Anna organisaation nimi tai kaupunki kaikille kielille.", diff --git a/front/app/translations/admin/fr-BE.json b/front/app/translations/admin/fr-BE.json index 8f8f20d58af6..cdadf674be25 100644 --- a/front/app/translations/admin/fr-BE.json +++ b/front/app/translations/admin/fr-BE.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activité", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Veuillez insérer une image de couverture", - "app.containers.AdminPage.SettingsPage.noLogo": "Veuillez insérer un logo", "app.containers.AdminPage.SettingsPage.no_button": "Aucun bouton", "app.containers.AdminPage.SettingsPage.organizationName": "Nom de l'organisation ou commune", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Indiquez le nom de l'organisation ou la ville pour toutes les langues.", diff --git a/front/app/translations/admin/fr-FR.json b/front/app/translations/admin/fr-FR.json index 356557285756..ed079c9de135 100644 --- a/front/app/translations/admin/fr-FR.json +++ b/front/app/translations/admin/fr-FR.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activité", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Veuillez insérer une image de couverture", - "app.containers.AdminPage.SettingsPage.noLogo": "Veuillez insérer un logo", "app.containers.AdminPage.SettingsPage.no_button": "Aucun bouton", "app.containers.AdminPage.SettingsPage.organizationName": "Nom de l'organisation ou de la commune", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Indiquez le nom de l'organisation ou la ville pour toutes les langues.", diff --git a/front/app/translations/admin/hr-HR.json b/front/app/translations/admin/hr-HR.json index 073f5ac616ef..ec3dd54bda85 100644 --- a/front/app/translations/admin/hr-HR.json +++ b/front/app/translations/admin/hr-HR.json @@ -1991,7 +1991,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Aktivnost", "app.containers.AdminPage.SettingsPage.logo": "Logotip", "app.containers.AdminPage.SettingsPage.noHeader": "Prenesite sliku zaglavlja", - "app.containers.AdminPage.SettingsPage.noLogo": "Prenesite logotip", "app.containers.AdminPage.SettingsPage.no_button": "Nema gumba", "app.containers.AdminPage.SettingsPage.organizationName": "Naziv grada ili organizacije", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Navedite naziv organizacije ili grad za sve jezike.", diff --git a/front/app/translations/admin/hu-HU.json b/front/app/translations/admin/hu-HU.json index b3123ce0f9b4..5d8e77d8c5cb 100644 --- a/front/app/translations/admin/hu-HU.json +++ b/front/app/translations/admin/hu-HU.json @@ -683,7 +683,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image (1440 x 480 px)", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.phone": "Phone", diff --git a/front/app/translations/admin/it-IT.json b/front/app/translations/admin/it-IT.json index 8782c8647693..703f2ea07d76 100644 --- a/front/app/translations/admin/it-IT.json +++ b/front/app/translations/admin/it-IT.json @@ -1314,7 +1314,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Attività", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/kl-GL.json b/front/app/translations/admin/kl-GL.json index 5d293e71d7b4..1a83f2d092f7 100644 --- a/front/app/translations/admin/kl-GL.json +++ b/front/app/translations/admin/kl-GL.json @@ -1086,7 +1086,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Ilisarnaat", "app.containers.AdminPage.SettingsPage.noHeader": "Bannerip assitassaanik ikkussilaarit (1440 x 480 px)", - "app.containers.AdminPage.SettingsPage.noLogo": "Ilisarnaammik ikkussilaarit", "app.containers.AdminPage.SettingsPage.no_button": "Attataasaqanngilaq", "app.containers.AdminPage.SettingsPage.organizationName": "Illoqarfiup ingerlatseqatigiiffiulluunniit aqqa", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/lb-LU.json b/front/app/translations/admin/lb-LU.json index d2b5355d5891..8653a1672b07 100644 --- a/front/app/translations/admin/lb-LU.json +++ b/front/app/translations/admin/lb-LU.json @@ -1086,7 +1086,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Provide an organization name or city for all languages.", diff --git a/front/app/translations/admin/lv-LV.json b/front/app/translations/admin/lv-LV.json index 0cfa0abff4ab..5475900185fc 100644 --- a/front/app/translations/admin/lv-LV.json +++ b/front/app/translations/admin/lv-LV.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Pasākums", "app.containers.AdminPage.SettingsPage.logo": "Logotips", "app.containers.AdminPage.SettingsPage.noHeader": "Lūdzu, augšupielādējiet galvenes attēlu", - "app.containers.AdminPage.SettingsPage.noLogo": "Lūdzu, augšupielādējiet logotipu", "app.containers.AdminPage.SettingsPage.no_button": "Nav pogas", "app.containers.AdminPage.SettingsPage.organizationName": "Pilsētas vai organizācijas nosaukums", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Norādiet organizācijas nosaukumu vai pilsētu visām valodām.", diff --git a/front/app/translations/admin/mi.json b/front/app/translations/admin/mi.json index 9e00c8f36594..2f7ceb455803 100644 --- a/front/app/translations/admin/mi.json +++ b/front/app/translations/admin/mi.json @@ -683,7 +683,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image (1440 x 480 px)", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.phone": "Phone", diff --git a/front/app/translations/admin/nb-NO.json b/front/app/translations/admin/nb-NO.json index 8d7893520f42..98a2d90b2d8d 100644 --- a/front/app/translations/admin/nb-NO.json +++ b/front/app/translations/admin/nb-NO.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Aktivitet", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Vennligst last opp et topptekstbilde", - "app.containers.AdminPage.SettingsPage.noLogo": "Vennligst last opp en logo", "app.containers.AdminPage.SettingsPage.no_button": "Ingen knapp", "app.containers.AdminPage.SettingsPage.organizationName": "Navn på by eller organisasjon", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Oppgi et organisasjonsnavn eller en by for alle språk.", diff --git a/front/app/translations/admin/nl-BE.json b/front/app/translations/admin/nl-BE.json index e42fb8261c2d..413a0506fed2 100644 --- a/front/app/translations/admin/nl-BE.json +++ b/front/app/translations/admin/nl-BE.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activiteit", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Plaats hier de achtergrondfoto", - "app.containers.AdminPage.SettingsPage.noLogo": "Plaats hier je logo", "app.containers.AdminPage.SettingsPage.no_button": "Geen knop", "app.containers.AdminPage.SettingsPage.organizationName": "Naam gemeente of organisatie", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Geef een organisatienaam of stad voor alle talen.", diff --git a/front/app/translations/admin/nl-NL.json b/front/app/translations/admin/nl-NL.json index 26b691349b96..e1c8f645e4f9 100644 --- a/front/app/translations/admin/nl-NL.json +++ b/front/app/translations/admin/nl-NL.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activiteit", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Plaats hier de achtergrondfoto", - "app.containers.AdminPage.SettingsPage.noLogo": "Plaats hier je logo", "app.containers.AdminPage.SettingsPage.no_button": "Geen knop", "app.containers.AdminPage.SettingsPage.organizationName": "Naam gemeente of organisatie", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Geef een organisatienaam of stad voor alle talen.", diff --git a/front/app/translations/admin/pa-IN.json b/front/app/translations/admin/pa-IN.json index 24263dd227c2..91e14bbd2798 100644 --- a/front/app/translations/admin/pa-IN.json +++ b/front/app/translations/admin/pa-IN.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "ਗਤੀਵਿਧੀ", "app.containers.AdminPage.SettingsPage.logo": "ਲੋਗੋ", "app.containers.AdminPage.SettingsPage.noHeader": "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਸਿਰਲੇਖ ਚਿੱਤਰ ਅੱਪਲੋਡ ਕਰੋ", - "app.containers.AdminPage.SettingsPage.noLogo": "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਲੋਗੋ ਅੱਪਲੋਡ ਕਰੋ", "app.containers.AdminPage.SettingsPage.no_button": "ਕੋਈ ਬਟਨ ਨਹੀਂ", "app.containers.AdminPage.SettingsPage.organizationName": "ਸ਼ਹਿਰ ਜਾਂ ਸੰਸਥਾ ਦਾ ਨਾਮ", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "ਸਾਰੀਆਂ ਭਾਸ਼ਾਵਾਂ ਲਈ ਇੱਕ ਸੰਸਥਾ ਦਾ ਨਾਮ ਜਾਂ ਸ਼ਹਿਰ ਪ੍ਰਦਾਨ ਕਰੋ।", diff --git a/front/app/translations/admin/pl-PL.json b/front/app/translations/admin/pl-PL.json index 20bfa88de56e..027d99d3a31a 100644 --- a/front/app/translations/admin/pl-PL.json +++ b/front/app/translations/admin/pl-PL.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Aktywności", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Proszę prześlij obraz nagłówka", - "app.containers.AdminPage.SettingsPage.noLogo": "Prześlij logo", "app.containers.AdminPage.SettingsPage.no_button": "Brak przycisku", "app.containers.AdminPage.SettingsPage.organizationName": "Nazwa organizacji, miasto lub gmina", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Podaj nazwę organizacji lub miasto dla wszystkich języków.", diff --git a/front/app/translations/admin/pt-BR.json b/front/app/translations/admin/pt-BR.json index d657af738b70..37f53c8d3af0 100644 --- a/front/app/translations/admin/pt-BR.json +++ b/front/app/translations/admin/pt-BR.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Atividade", "app.containers.AdminPage.SettingsPage.logo": "Logotipo", "app.containers.AdminPage.SettingsPage.noHeader": "Faça upload de uma imagem de cabeçalho", - "app.containers.AdminPage.SettingsPage.noLogo": "Faça upload de um logotipo", "app.containers.AdminPage.SettingsPage.no_button": "Nenhum botão", "app.containers.AdminPage.SettingsPage.organizationName": "Nome da cidade ou organização", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Fornecer o nome de uma organização ou cidade para todas as línguas.", diff --git a/front/app/translations/admin/ro-RO.json b/front/app/translations/admin/ro-RO.json index 0a78e94c57ff..101abaa42e02 100644 --- a/front/app/translations/admin/ro-RO.json +++ b/front/app/translations/admin/ro-RO.json @@ -1003,7 +1003,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Activity", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Please upload a header image", - "app.containers.AdminPage.SettingsPage.noLogo": "Please upload a logo", "app.containers.AdminPage.SettingsPage.no_button": "No button", "app.containers.AdminPage.SettingsPage.organizationName": "Name of city or organization", "app.containers.AdminPage.SettingsPage.overlayToggleLabel": "Enable overlay", diff --git a/front/app/translations/admin/sr-Latn.json b/front/app/translations/admin/sr-Latn.json index b249ae62d873..6f6c410a1e47 100644 --- a/front/app/translations/admin/sr-Latn.json +++ b/front/app/translations/admin/sr-Latn.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Aktivnosti", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Molimo vas postavite header sliku", - "app.containers.AdminPage.SettingsPage.noLogo": "Molimo vas postavite logo", "app.containers.AdminPage.SettingsPage.no_button": "Nema dugmeta", "app.containers.AdminPage.SettingsPage.organizationName": "Ime grada ili organizacije", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Наведите назив организације или град за све језике.", diff --git a/front/app/translations/admin/sr-SP.json b/front/app/translations/admin/sr-SP.json index 55c9bc002604..397034d16bf3 100644 --- a/front/app/translations/admin/sr-SP.json +++ b/front/app/translations/admin/sr-SP.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Активност", "app.containers.AdminPage.SettingsPage.logo": "Лого", "app.containers.AdminPage.SettingsPage.noHeader": "Отпремите слику заглавља", - "app.containers.AdminPage.SettingsPage.noLogo": "Отпремите лого", "app.containers.AdminPage.SettingsPage.no_button": "Нема дугмета", "app.containers.AdminPage.SettingsPage.organizationName": "Назив града или организације", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Наведите назив организације или град за све језике.", diff --git a/front/app/translations/admin/sv-SE.json b/front/app/translations/admin/sv-SE.json index 9f40592d5449..5c8cd99fc589 100644 --- a/front/app/translations/admin/sv-SE.json +++ b/front/app/translations/admin/sv-SE.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Aktivitet", "app.containers.AdminPage.SettingsPage.logo": "Logotyp", "app.containers.AdminPage.SettingsPage.noHeader": "Ladda upp en rubrikbild", - "app.containers.AdminPage.SettingsPage.noLogo": "Ladda upp en logotyp", "app.containers.AdminPage.SettingsPage.no_button": "Ingen knapp", "app.containers.AdminPage.SettingsPage.organizationName": "Namn på stad eller organisation", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Ange ett organisationsnamn eller en stad för alla språk.", diff --git a/front/app/translations/admin/tr-TR.json b/front/app/translations/admin/tr-TR.json index eaf9985e0f03..45f185bce577 100644 --- a/front/app/translations/admin/tr-TR.json +++ b/front/app/translations/admin/tr-TR.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "Etkinlik", "app.containers.AdminPage.SettingsPage.logo": "Logo", "app.containers.AdminPage.SettingsPage.noHeader": "Lütfen bir başlık görseli yükleyin", - "app.containers.AdminPage.SettingsPage.noLogo": "Lütfen bir logo yükleyin", "app.containers.AdminPage.SettingsPage.no_button": "Düğme yok", "app.containers.AdminPage.SettingsPage.organizationName": "Kentin veya kuruluşun adı", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "Tüm diller için bir kuruluş adı veya şehir belirtin.", diff --git a/front/app/translations/admin/ur-PK.json b/front/app/translations/admin/ur-PK.json index 75ee593e67e9..3e007e00a93d 100644 --- a/front/app/translations/admin/ur-PK.json +++ b/front/app/translations/admin/ur-PK.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "سرگرمی", "app.containers.AdminPage.SettingsPage.logo": "لوگو", "app.containers.AdminPage.SettingsPage.noHeader": "براہ کرم ایک ہیڈر امیج اپ لوڈ کریں۔", - "app.containers.AdminPage.SettingsPage.noLogo": "براہ کرم لوگو اپ لوڈ کریں۔", "app.containers.AdminPage.SettingsPage.no_button": "کوئی بٹن نہیں۔", "app.containers.AdminPage.SettingsPage.organizationName": "شہر یا تنظیم کا نام", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "تمام زبانوں کے لیے تنظیم کا نام یا شہر فراہم کریں۔", From 97d1e48d418cdf1a2c469d27a009ff95f79aaed6 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 30 Oct 2024 13:05:19 +0300 Subject: [PATCH 12/55] Use editable survey title as page title for surveys --- .../IdeasNewSurveyForm/index.tsx | 10 ++++-- .../IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx | 35 ++++--------------- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyForm/index.tsx b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyForm/index.tsx index 3df6fe661cd2..99f0452fa97e 100644 --- a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyForm/index.tsx +++ b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyForm/index.tsx @@ -283,9 +283,15 @@ const IdeasNewSurveyForm = ({ project, phaseId }: Props) => { return `${dynamicHeight}px`; } + if (!phase) { + return null; + } + return ( <> - + { maxWidth={usingMapView ? '1100px' : '700px'} > diff --git a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx index 39d537728f99..fef7cbaf03b5 100644 --- a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx +++ b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx @@ -2,47 +2,26 @@ import React from 'react'; import { Helmet } from 'react-helmet'; -import useAuthUser from 'api/me/useAuthUser'; - import useAppConfigurationLocales from 'hooks/useAppConfigurationLocales'; -import { useIntl } from 'utils/cl-intl'; import getAlternateLinks from 'utils/cl-router/getAlternateLinks'; import getCanonicalLink from 'utils/cl-router/getCanonicalLink'; -import ideationMessages from '../IdeasNewPage/messages'; - -import messages from './messages'; +interface Props { + surveyTitle: string; +} -const IdeasNewSurveyMeta = () => { - const { formatMessage } = useIntl(); - const { data: authUser } = useAuthUser(); +const IdeasNewSurveyMeta = ({ surveyTitle }: Props) => { const locales = useAppConfigurationLocales(); const { location } = window; - const ideasIndexTitle = formatMessage(messages.surveyNewMetaTitle1); - const ideasIndexDescription = formatMessage( - ideationMessages.ideaNewMetaDescription - ); - return ( - - {` - ${ - authUser && authUser.data.attributes.unread_notifications - ? `(${authUser.data.attributes.unread_notifications}) ` - : '' - } - ${ideasIndexTitle} - `} - + {surveyTitle} {getAlternateLinks(locales)} {getCanonicalLink()} - - - - + + ); From 275ded80e0806f6357763991bf4b14a76cd6b717 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 30 Oct 2024 13:13:33 +0300 Subject: [PATCH 13/55] Maintain the orgName at the end of the title --- .../IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx | 13 ++++++++++--- front/app/containers/IdeasNewSurveyPage/messages.ts | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx index fef7cbaf03b5..e427f3d273ca 100644 --- a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx +++ b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx @@ -4,24 +4,31 @@ import { Helmet } from 'react-helmet'; import useAppConfigurationLocales from 'hooks/useAppConfigurationLocales'; +import { useIntl } from 'utils/cl-intl'; import getAlternateLinks from 'utils/cl-router/getAlternateLinks'; import getCanonicalLink from 'utils/cl-router/getCanonicalLink'; +import messages from './messages'; + interface Props { surveyTitle: string; } const IdeasNewSurveyMeta = ({ surveyTitle }: Props) => { + const { formatMessage } = useIntl(); const locales = useAppConfigurationLocales(); const { location } = window; + const title = formatMessage(messages.surveyNewMetaTitle2, { + surveyTitle, + }); return ( - {surveyTitle} + {title} {getAlternateLinks(locales)} {getCanonicalLink()} - - + + ); diff --git a/front/app/containers/IdeasNewSurveyPage/messages.ts b/front/app/containers/IdeasNewSurveyPage/messages.ts index ce4ee10a29c4..0f443593931b 100644 --- a/front/app/containers/IdeasNewSurveyPage/messages.ts +++ b/front/app/containers/IdeasNewSurveyPage/messages.ts @@ -1,9 +1,9 @@ import { defineMessages } from 'react-intl'; export default defineMessages({ - surveyNewMetaTitle1: { - id: 'app.containers.IdeasNewPage.surveyNewMetaTitle1', - defaultMessage: 'Add survey response to project | {orgName}', + surveyNewMetaTitle2: { + id: 'app.containers.IdeasNewPage.surveyNewMetaTitle2', + defaultMessage: '{surveyTitle} | {orgName}', }, surveySubmittedTitle: { id: 'app.containers.IdeasNewPage.SurveySubmittedNotice.surveySubmittedTitle', From 64a9071f98fcd34d57f4e2ee546b63e048995402 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Wed, 30 Oct 2024 10:16:40 +0000 Subject: [PATCH 14/55] Translations updated by CI (extract-intl) --- front/app/translations/ar-MA.json | 1 - front/app/translations/ar-SA.json | 1 - front/app/translations/ca-ES.json | 1 - front/app/translations/cy-GB.json | 1 - front/app/translations/da-DK.json | 1 - front/app/translations/de-DE.json | 1 - front/app/translations/el-GR.json | 1 - front/app/translations/en-CA.json | 1 - front/app/translations/en-GB.json | 1 - front/app/translations/en-IE.json | 1 - front/app/translations/en.json | 2 +- front/app/translations/es-CL.json | 1 - front/app/translations/es-ES.json | 1 - front/app/translations/fi-FI.json | 1 - front/app/translations/fr-BE.json | 1 - front/app/translations/fr-FR.json | 1 - front/app/translations/hr-HR.json | 1 - front/app/translations/it-IT.json | 1 - front/app/translations/lb-LU.json | 1 - front/app/translations/lv-LV.json | 1 - front/app/translations/nb-NO.json | 1 - front/app/translations/nl-BE.json | 1 - front/app/translations/nl-NL.json | 1 - front/app/translations/pa-IN.json | 1 - front/app/translations/pl-PL.json | 1 - front/app/translations/pt-BR.json | 1 - front/app/translations/sr-Latn.json | 1 - front/app/translations/sr-SP.json | 1 - front/app/translations/sv-SE.json | 1 - front/app/translations/tr-TR.json | 1 - front/app/translations/ur-PK.json | 1 - 31 files changed, 1 insertion(+), 31 deletions(-) diff --git a/front/app/translations/ar-MA.json b/front/app/translations/ar-MA.json index ce7a4bbb1448..c808cc9b95ff 100644 --- a/front/app/translations/ar-MA.json +++ b/front/app/translations/ar-MA.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "إضافة مشروع جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "إضافة اقتراح جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "أضف سؤال جديد للمشروع | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "إضافة استجابة الاستطلاع للمشروع | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "قبول الدعوة", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "دعوة للمشاركة في الرعاية", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "الرعاة المشاركون", diff --git a/front/app/translations/ar-SA.json b/front/app/translations/ar-SA.json index 366f5bc07917..00997a281c2c 100644 --- a/front/app/translations/ar-SA.json +++ b/front/app/translations/ar-SA.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "إضافة مشروع جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "إضافة اقتراح جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "أضف سؤال جديد للمشروع | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "إضافة استجابة الاستطلاع للمشروع | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "قبول الدعوة", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "دعوة للمشاركة في الرعاية", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "الرعاة المشاركون", diff --git a/front/app/translations/ca-ES.json b/front/app/translations/ca-ES.json index 48fc2359f35a..9862a31d2ba6 100644 --- a/front/app/translations/ca-ES.json +++ b/front/app/translations/ca-ES.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Afegeix un nou projecte al projecte | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Afegeix una nova proposta al projecte | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Afegeix una pregunta nova al projecte | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Afegeix la resposta de l'enquesta al projecte | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepta la invitació", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitació de copatrocini", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Copatrocinadors", diff --git a/front/app/translations/cy-GB.json b/front/app/translations/cy-GB.json index e05fa424eb55..582f26b4ed6b 100644 --- a/front/app/translations/cy-GB.json +++ b/front/app/translations/cy-GB.json @@ -1238,7 +1238,6 @@ "app.containers.IdeasNewPage.optionMetaTitle1": "Ychwanegu opsiwn newydd i'r prosiect | {orgName}", "app.containers.IdeasNewPage.projectMetaTitle1": "Ychwanegu prosiect newydd i'r prosiect | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Ychwanegu cwestiwn newydd i'r prosiect | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Ychwanegu ymateb arolwg i'r prosiect | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Derbyn gwahoddiad", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Gwahoddiad i gyd-noddi", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Cyd-noddwyr", diff --git a/front/app/translations/da-DK.json b/front/app/translations/da-DK.json index 8c19d646466d..0da5d147654e 100644 --- a/front/app/translations/da-DK.json +++ b/front/app/translations/da-DK.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Tilføj nyt projekt til projekt | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Tilføj nyt forslag til projektet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Tilføj nyt spørgsmål til projektet | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Tilføj spørgeskemasvar til projektet | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepter invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitation til at blive medstiller", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Medstillere", diff --git a/front/app/translations/de-DE.json b/front/app/translations/de-DE.json index c2d89425ef32..6b2fb3aab736 100644 --- a/front/app/translations/de-DE.json +++ b/front/app/translations/de-DE.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Neues Projekt zum Projekt hinzufügen | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Neuen Vorschlag zum Projekt hinzufügen | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Neue Frage zum Projekt hinzufügen | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Umfrageantwort zum Projekt hinzufügen | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Einladung annehmen", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Einladung zum Unterstützen", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Unterstützer*innen", diff --git a/front/app/translations/el-GR.json b/front/app/translations/el-GR.json index 6ce3e18e11ee..02ebe6b58ddc 100644 --- a/front/app/translations/el-GR.json +++ b/front/app/translations/el-GR.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Προσθήκη νέου έργου στο έργο | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Προσθήκη νέας πρότασης στο έργο | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Προσθήκη νέας ερώτησης στο έργο | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Προσθέστε την απάντηση της έρευνας στο έργο | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Αποδοχή πρόσκλησης", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Πρόσκληση για συν-χορηγία", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Συν-χορηγοί", diff --git a/front/app/translations/en-CA.json b/front/app/translations/en-CA.json index 9cddc86527e0..a97e8f29c0bc 100644 --- a/front/app/translations/en-CA.json +++ b/front/app/translations/en-CA.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Add survey response to project | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", diff --git a/front/app/translations/en-GB.json b/front/app/translations/en-GB.json index 0063bf8bef5c..1d953f73e772 100644 --- a/front/app/translations/en-GB.json +++ b/front/app/translations/en-GB.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Add survey response to project | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", diff --git a/front/app/translations/en-IE.json b/front/app/translations/en-IE.json index ff4a4dec70d6..26a6bb7b869f 100644 --- a/front/app/translations/en-IE.json +++ b/front/app/translations/en-IE.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Add survey response to project | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", diff --git a/front/app/translations/en.json b/front/app/translations/en.json index ff4a4dec70d6..3d829bf244fa 100644 --- a/front/app/translations/en.json +++ b/front/app/translations/en.json @@ -1298,7 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Add survey response to project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", diff --git a/front/app/translations/es-CL.json b/front/app/translations/es-CL.json index db8b7f581c2e..758e6d556a18 100644 --- a/front/app/translations/es-CL.json +++ b/front/app/translations/es-CL.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Añadir nuevo proyecto al proyecto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Añadir nueva propuesta al proyecto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Añadir una nueva pregunta al proyecto | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Añade la respuesta de la encuesta al proyecto | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Acepta la invitación", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitación al copatrocinio", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Copatrocinadores", diff --git a/front/app/translations/es-ES.json b/front/app/translations/es-ES.json index c77744ec80cd..51c8a2d0d9aa 100644 --- a/front/app/translations/es-ES.json +++ b/front/app/translations/es-ES.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Añadir nuevo proyecto al proyecto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Añadir nueva propuesta al proyecto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Añadir una nueva pregunta al proyecto | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Añade la respuesta de la encuesta al proyecto | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Acepta la invitación", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitación al copatrocinio", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Copatrocinadores", diff --git a/front/app/translations/fi-FI.json b/front/app/translations/fi-FI.json index 47c8c176cc2f..f66d4a43940a 100644 --- a/front/app/translations/fi-FI.json +++ b/front/app/translations/fi-FI.json @@ -1238,7 +1238,6 @@ "app.containers.IdeasNewPage.optionMetaTitle1": "Lisää uusi vaihtoehto projektiin | {orgName}", "app.containers.IdeasNewPage.projectMetaTitle1": "Lisää uusi projekti projektiin | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Lisää uusi kysymys projektiin | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Lisää kyselyvastaus projektiin | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Hyväksy kutsu", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Yhteissponsorointikutsu", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Yhteissponsorit", diff --git a/front/app/translations/fr-BE.json b/front/app/translations/fr-BE.json index b808419f98be..730e3c89e891 100644 --- a/front/app/translations/fr-BE.json +++ b/front/app/translations/fr-BE.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Ajouter un nouveau projet au projet {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Ajouter une nouvelle proposition au projet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Ajouter une nouvelle question au projet {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Répondre à l'enquête | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepter l'invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitation à soutenir", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Coparrainants", diff --git a/front/app/translations/fr-FR.json b/front/app/translations/fr-FR.json index 0383f162bd91..0738b809d308 100644 --- a/front/app/translations/fr-FR.json +++ b/front/app/translations/fr-FR.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Ajouter un nouveau projet au projet {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Ajouter une nouvelle proposition au projet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Ajouter une nouvelle question au projet {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Répondre à l'enquête | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepter l'invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitation à soutenir", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Coparrainants", diff --git a/front/app/translations/hr-HR.json b/front/app/translations/hr-HR.json index 1e0219eaba5f..f462587e5f94 100644 --- a/front/app/translations/hr-HR.json +++ b/front/app/translations/hr-HR.json @@ -1238,7 +1238,6 @@ "app.containers.IdeasNewPage.optionMetaTitle1": "Dodaj novu opciju projektu | {orgName}", "app.containers.IdeasNewPage.projectMetaTitle1": "Dodaj novi projekt projektu | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Dodaj novo pitanje projektu | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Dodajte odgovor na anketu projektu | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Prihvatite poziv", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Poziv za supokroviteljstvo", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Supokrovitelji", diff --git a/front/app/translations/it-IT.json b/front/app/translations/it-IT.json index 240803350438..b841aba368a0 100644 --- a/front/app/translations/it-IT.json +++ b/front/app/translations/it-IT.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Aggiungi un nuovo progetto al progetto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Aggiungi una nuova proposta al progetto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Aggiungi una nuova domanda al progetto | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Aggiungi la risposta al sondaggio al progetto | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accetta l'invito", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invito alla co-sponsorizzazione", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsor", diff --git a/front/app/translations/lb-LU.json b/front/app/translations/lb-LU.json index 6da4bf06a993..31beb915c1f6 100644 --- a/front/app/translations/lb-LU.json +++ b/front/app/translations/lb-LU.json @@ -1238,7 +1238,6 @@ "app.containers.IdeasNewPage.optionMetaTitle1": "Füügt nei Optioun fir de Projet | {orgName}", "app.containers.IdeasNewPage.projectMetaTitle1": "Füügt neie Projet un de Projet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Füügt nei Fro zum Projet | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Füügt Ëmfro Äntwert op Projet | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Akzeptéieren Invitatioun", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-Sponsoring Invitatioun", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-Sponsoren", diff --git a/front/app/translations/lv-LV.json b/front/app/translations/lv-LV.json index 99f0587f8517..ca72ed4e9dcd 100644 --- a/front/app/translations/lv-LV.json +++ b/front/app/translations/lv-LV.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Pievienot jaunu projektu projektam | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Pievienot jaunu priekšlikumu projektam | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Pievienot jaunu jautājumu projektam | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Aptaujas atbilžu pievienošana projektam | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Pieņemt ielūgumu", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Līdzfinansējuma uzaicinājums", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Līdzfinansētāji", diff --git a/front/app/translations/nb-NO.json b/front/app/translations/nb-NO.json index 29e1bae0e43d..829983de6112 100644 --- a/front/app/translations/nb-NO.json +++ b/front/app/translations/nb-NO.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Legg til nytt prosjekt i prosjekt | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Legg til nytt forslag i prosjektet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Legg til nytt spørsmål i prosjektet | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Legg til svar på undersøkelsen i prosjektet {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Godta invitasjon", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitasjon til medsponsorskap", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Medsponsorer", diff --git a/front/app/translations/nl-BE.json b/front/app/translations/nl-BE.json index 493eda8246dd..15662b5f5c79 100644 --- a/front/app/translations/nl-BE.json +++ b/front/app/translations/nl-BE.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Voeg nieuwe project toe aan project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Nieuw voorstel toevoegen aan project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Voeg nieuwe vraag toe aan project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Voeg vragenlijst-reactie toe aan project {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Uitnodiging accepteren", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Uitnodiging tot ondersteuner", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Ondersteuners", diff --git a/front/app/translations/nl-NL.json b/front/app/translations/nl-NL.json index a4072396bf4f..fe7fd7918633 100644 --- a/front/app/translations/nl-NL.json +++ b/front/app/translations/nl-NL.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Voeg nieuwe project toe aan project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Nieuw voorstel toevoegen aan project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Voeg nieuwe vraag toe aan project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Voeg vragenlijst-reactie toe aan project {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Uitnodiging accepteren", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Uitnodiging tot ondersteuner", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Ondersteuners", diff --git a/front/app/translations/pa-IN.json b/front/app/translations/pa-IN.json index aa109923a039..29bf4f6a9e40 100644 --- a/front/app/translations/pa-IN.json +++ b/front/app/translations/pa-IN.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਨਵਾਂ ਪ੍ਰੋਜੈਕਟ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਨਵਾਂ ਪ੍ਰਸਤਾਵ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਨਵਾਂ ਸਵਾਲ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਲਈ ਸਰਵੇਖਣ ਜਵਾਬ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "ਸੱਦਾ ਸਵੀਕਾਰ ਕਰੋ", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "ਸਹਿ-ਸਪਾਂਸਰਸ਼ਿਪ ਦਾ ਸੱਦਾ", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "ਸਹਿ-ਪ੍ਰਾਯੋਜਕ", diff --git a/front/app/translations/pl-PL.json b/front/app/translations/pl-PL.json index dbcee5c17d3b..6b84e275065a 100644 --- a/front/app/translations/pl-PL.json +++ b/front/app/translations/pl-PL.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Dodaj nowy projekt do projektu | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Dodaj nową propozycję do projektu | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Dodaj nowe pytanie do projektu | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Dodaj odpowiedź z ankiety do projektu | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Przyjmij zaproszenie", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Zaproszenie do współsponsorowania", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Współsponsorzy", diff --git a/front/app/translations/pt-BR.json b/front/app/translations/pt-BR.json index 0c432340c765..3701a890eb0d 100644 --- a/front/app/translations/pt-BR.json +++ b/front/app/translations/pt-BR.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Adicionar novo projeto ao projeto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Adicionar nova proposta ao projeto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Adicionar nova pergunta ao projeto | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Adicione a resposta da pesquisa ao projeto | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Aceitar o convite", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Convite de copatrocínio", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-patrocinadores", diff --git a/front/app/translations/sr-Latn.json b/front/app/translations/sr-Latn.json index d8af76dee386..76618f6011b0 100644 --- a/front/app/translations/sr-Latn.json +++ b/front/app/translations/sr-Latn.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Add survey response to project | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", diff --git a/front/app/translations/sr-SP.json b/front/app/translations/sr-SP.json index 9451e93f68a6..a1500fd3f6d2 100644 --- a/front/app/translations/sr-SP.json +++ b/front/app/translations/sr-SP.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Add survey response to project | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", diff --git a/front/app/translations/sv-SE.json b/front/app/translations/sv-SE.json index fb6f87859ebe..c38a91933193 100644 --- a/front/app/translations/sv-SE.json +++ b/front/app/translations/sv-SE.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Lägg till nytt projekt till projekt | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Lägg till nytt förslag till projekt | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Lägg till ny fråga i projektet | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Lägg till enkätsvar i projektet | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Acceptera inbjudan", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Inbjudan till medsponsring", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Medförslagsställare", diff --git a/front/app/translations/tr-TR.json b/front/app/translations/tr-TR.json index 7a6d986dc76f..0ce40827cdd2 100644 --- a/front/app/translations/tr-TR.json +++ b/front/app/translations/tr-TR.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Projeye yeni proje ekle | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Projeye yeni teklif ekleyin | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Projeye yeni soru ekleyin | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "Anket yanıtını projeye ekleyin | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Daveti kabul et", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Eş sponsorluk daveti", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Eş sponsorlar", diff --git a/front/app/translations/ur-PK.json b/front/app/translations/ur-PK.json index 06c83a407af5..9eefbcd00103 100644 --- a/front/app/translations/ur-PK.json +++ b/front/app/translations/ur-PK.json @@ -1298,7 +1298,6 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "پروجیکٹ میں نیا پروجیکٹ شامل کریں | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "پروجیکٹ میں نئی تجویز شامل کریں | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "پروجیکٹ میں نیا سوال شامل کریں | {orgName}", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "پروجیکٹ میں سروے کا جواب شامل کریں | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "دعوت قبول کریں۔", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "شریک کفالت کی دعوت", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "شریک سپانسرز", From cf47a6abfe8618119510e04200822c6259a4c4b3 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 31 Oct 2024 07:41:01 +0300 Subject: [PATCH 15/55] Fix color contrast in links --- front/app/component-library/utils/styleUtils.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/front/app/component-library/utils/styleUtils.ts b/front/app/component-library/utils/styleUtils.ts index e9cf112f0b59..611e5eab36aa 100644 --- a/front/app/component-library/utils/styleUtils.ts +++ b/front/app/component-library/utils/styleUtils.ts @@ -274,7 +274,6 @@ type StylingConstsType = { // Reusable text styling export function quillEditedContent( buttonColor = colors.teal, - linkColor = colors.teal, textColor = colors.textPrimary, mentionColor = colors.textPrimary, fontSize: 's' | 'base' | 'm' | 'l' = 'base', @@ -295,7 +294,7 @@ export function quillEditedContent( return ` ${defaultFontStyle} - a, li, p { + li, p { ${defaultFontStyle} } @@ -315,7 +314,7 @@ export function quillEditedContent( a { font-size: inherit; font-weight: inherit; - text-decoration: inherit; + text-decoration: underline; } } @@ -329,7 +328,7 @@ export function quillEditedContent( a { font-size: inherit; font-weight: inherit; - text-decoration: inherit; + text-decoration: underline; } } @@ -342,7 +341,6 @@ export function quillEditedContent( } a { - color: ${linkColor}; text-decoration: underline; overflow-wrap: break-word; word-wrap: break-word; @@ -350,12 +348,6 @@ export function quillEditedContent( word-break: break-word; hyphens: auto; transition: background 80ms ease-out; - - &:hover { - color: ${darken(0.15, linkColor)}; - background: ${transparentize(0.91, linkColor)}; - text-decoration: underline; - } } ul, ol { From 60c6391027f36b5a3174ab4df582ddeb8308cd25 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 31 Oct 2024 07:41:14 +0300 Subject: [PATCH 16/55] Remove unused linkColor --- front/app/components/UI/QuillEditedContent/index.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/front/app/components/UI/QuillEditedContent/index.tsx b/front/app/components/UI/QuillEditedContent/index.tsx index 842732b20f8e..3dae6e3319b2 100644 --- a/front/app/components/UI/QuillEditedContent/index.tsx +++ b/front/app/components/UI/QuillEditedContent/index.tsx @@ -4,7 +4,6 @@ import { quillEditedContent } from '@citizenlab/cl2-component-library'; import styled, { useTheme } from 'styled-components'; const Container = styled.div<{ - linkColor: Props['linkColor']; textColor: Props['textColor']; mentionColor: Props['mentionColor']; fontSize: Props['fontSize']; @@ -13,7 +12,6 @@ const Container = styled.div<{ ${(props) => quillEditedContent( props.theme.colors.tenantPrimary, - props.linkColor, props.textColor, props.mentionColor, props.fontSize, @@ -23,7 +21,6 @@ const Container = styled.div<{ interface Props { disableTabbing?: boolean; - linkColor?: string; textColor?: string; mentionColor?: string; fontSize?: 's' | 'base' | 'm' | 'l'; @@ -33,7 +30,6 @@ interface Props { } const QuillEditedContent = ({ - linkColor, textColor, mentionColor, fontSize, @@ -59,7 +55,6 @@ const QuillEditedContent = ({ return ( Date: Thu, 31 Oct 2024 07:50:54 +0300 Subject: [PATCH 17/55] Change link colors to pass color contrast requirements --- front/app/component-library/utils/styleUtils.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/front/app/component-library/utils/styleUtils.ts b/front/app/component-library/utils/styleUtils.ts index 611e5eab36aa..1b54943191da 100644 --- a/front/app/component-library/utils/styleUtils.ts +++ b/front/app/component-library/utils/styleUtils.ts @@ -341,6 +341,8 @@ export function quillEditedContent( } a { + color: #0000EE; /* Standard fallback for all browsers */ + color: -webkit-link; /* Overrides the fallback in WebKit browsers */ text-decoration: underline; overflow-wrap: break-word; word-wrap: break-word; From 12db70d13dcb60b95e7394331f37dfba20eeb222 Mon Sep 17 00:00:00 2001 From: jamesspeake Date: Thu, 31 Oct 2024 08:51:14 +0000 Subject: [PATCH 18/55] [TAN-2917] Rubocop fixes --- .../phase_context/update_all_native_survey_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb b/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb index bfb0698e83a9..38acdee235ad 100644 --- a/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb +++ b/back/engines/commercial/idea_custom_fields/spec/acceptance/idea_custom_fields/phase_context/update_all_native_survey_spec.rb @@ -3182,7 +3182,7 @@ ] } - expect{do_request(request)}.to enqueue_job(LogActivityJob).exactly(1).times + expect { do_request(request) }.to enqueue_job(LogActivityJob).exactly(1).times end context "Update custom field's map config relation" do From 562b33347e998c74878ed361e7a8c2003ec54f45 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 31 Oct 2024 13:57:15 +0300 Subject: [PATCH 19/55] Use surveyNewMetaTitle in strings instead --- front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx | 2 +- front/app/containers/IdeasNewSurveyPage/messages.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx index e427f3d273ca..804c5593f078 100644 --- a/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx +++ b/front/app/containers/IdeasNewSurveyPage/IdeasNewSurveyMeta.tsx @@ -18,7 +18,7 @@ const IdeasNewSurveyMeta = ({ surveyTitle }: Props) => { const { formatMessage } = useIntl(); const locales = useAppConfigurationLocales(); const { location } = window; - const title = formatMessage(messages.surveyNewMetaTitle2, { + const title = formatMessage(messages.surveyNewMetaTitle, { surveyTitle, }); diff --git a/front/app/containers/IdeasNewSurveyPage/messages.ts b/front/app/containers/IdeasNewSurveyPage/messages.ts index 0f443593931b..221e73250648 100644 --- a/front/app/containers/IdeasNewSurveyPage/messages.ts +++ b/front/app/containers/IdeasNewSurveyPage/messages.ts @@ -1,7 +1,7 @@ import { defineMessages } from 'react-intl'; export default defineMessages({ - surveyNewMetaTitle2: { + surveyNewMetaTitle: { id: 'app.containers.IdeasNewPage.surveyNewMetaTitle2', defaultMessage: '{surveyTitle} | {orgName}', }, From 5fd188cff87b5cdbf3befca214ce625eccca1918 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 31 Oct 2024 14:04:24 +0300 Subject: [PATCH 20/55] Remove h1 wrapper on logo --- .../containers/MainHeader/Components/TenantLogo/index.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/front/app/containers/MainHeader/Components/TenantLogo/index.tsx b/front/app/containers/MainHeader/Components/TenantLogo/index.tsx index 41c2e463775b..9d680aa409eb 100644 --- a/front/app/containers/MainHeader/Components/TenantLogo/index.tsx +++ b/front/app/containers/MainHeader/Components/TenantLogo/index.tsx @@ -38,10 +38,7 @@ const TenantLogo = () => { */ aria-label={formatMessage(messages.logoAltText)} > - {/* Used as main heading in case page has no headings for a11y.See https://html.com/semantic-markup/ */} -

- -

+ ); } From 23f4ba8186aea7b85ca778beb239a354cae92f16 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 31 Oct 2024 14:25:39 +0300 Subject: [PATCH 21/55] Adjust allowed years in single picker --- .../Calendar/utils/getStartEndMonth.ts | 2 +- .../DateSinglePicker/Calendar/index.tsx | 5 ++-- .../Calendar/utils/getStartEndMonth.ts | 27 +++---------------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts index 31f40f8733e2..d40e35640756 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts +++ b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts @@ -20,7 +20,7 @@ export const getStartMonth = ({ const times: number[] = [addYears(new Date(), -10).getTime()]; if (selectedRange.from) { - times.push(addYears(selectedRange.from, -2).getTime()); + times.push(addYears(selectedRange.from, -10).getTime()); } if (disabledRanges.length > 0) { diff --git a/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/index.tsx b/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/index.tsx index 7fd5826be341..10c685215c69 100644 --- a/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/index.tsx +++ b/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/index.tsx @@ -10,7 +10,7 @@ import useLocale from 'hooks/useLocale'; import { getLocale } from '../../_shared/locales'; import { CalendarProps } from '../typings'; -import { getEndMonth, getStartMonth } from './utils/getStartEndMonth'; +import { getEndMonth } from './utils/getStartEndMonth'; const DayPickerStyles = styled.div` .rdp-root { @@ -34,8 +34,7 @@ const Calendar = ({ onChange, }: CalendarProps) => { const locale = useLocale(); - - const startMonth = getStartMonth({ startMonth: _startMonth, selectedDate }); + const startMonth = new Date(1900, 0); const endMonth = getEndMonth({ endMonth: _endMonth, selectedDate }); return ( diff --git a/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/utils/getStartEndMonth.ts b/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/utils/getStartEndMonth.ts index 810e8a1f9553..b93f3c550527 100644 --- a/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/utils/getStartEndMonth.ts +++ b/front/app/components/admin/DatePickers/DateSinglePicker/Calendar/utils/getStartEndMonth.ts @@ -1,26 +1,5 @@ import { addYears } from 'date-fns'; -interface GetStartMonthProps { - startMonth?: Date; - selectedDate?: Date; -} - -export const getStartMonth = ({ - startMonth, - selectedDate, -}: GetStartMonthProps) => { - if (startMonth) return startMonth; - const twoYearsAgo = addYears(new Date(), -2); - - if (selectedDate) { - return new Date( - Math.min(addYears(selectedDate, -2).getTime(), twoYearsAgo.getTime()) - ); - } - - return twoYearsAgo; -}; - interface GetEndMonthProps { endMonth?: Date; selectedDate?: Date; @@ -28,13 +7,13 @@ interface GetEndMonthProps { export const getEndMonth = ({ endMonth, selectedDate }: GetEndMonthProps) => { if (endMonth) return endMonth; - const twoYearsFromNow = addYears(new Date(), 2); + const tenYearsFromNow = addYears(new Date(), 10); if (selectedDate) { return new Date( - Math.max(addYears(selectedDate, 2).getTime(), twoYearsFromNow.getTime()) + Math.max(addYears(selectedDate, 10).getTime(), tenYearsFromNow.getTime()) ); } - return twoYearsFromNow; + return tenYearsFromNow; }; From a2a9bc62d4a20a1bf288b5fb3d6ef1fde7901baa Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 31 Oct 2024 14:32:08 +0300 Subject: [PATCH 22/55] Fix 10 year adjustment --- .../DatePhasePicker/Calendar/utils/getStartEndMonth.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts index d40e35640756..8e664bbbf8f6 100644 --- a/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts +++ b/front/app/components/admin/DatePickers/DatePhasePicker/Calendar/utils/getStartEndMonth.ts @@ -52,7 +52,7 @@ export const getEndMonth = ({ const times: number[] = [addYears(new Date(), 10).getTime()]; if (selectedRange.to) { - times.push(addYears(selectedRange.to, 2).getTime()); + times.push(addYears(selectedRange.to, 10).getTime()); } if (disabledRanges.length > 0) { From 29d0e0b7591987104fc05c0ed294ca0315c38a47 Mon Sep 17 00:00:00 2001 From: jamesspeake Date: Thu, 31 Oct 2024 11:39:50 +0000 Subject: [PATCH 23/55] [TAN-2921] Project missing from nav bar serialization in templates --- .../multi_tenancy/templates/serializers/nav_bar_item.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/engines/commercial/multi_tenancy/app/services/multi_tenancy/templates/serializers/nav_bar_item.rb b/back/engines/commercial/multi_tenancy/app/services/multi_tenancy/templates/serializers/nav_bar_item.rb index 59ce64d35650..09d8b28b80a8 100644 --- a/back/engines/commercial/multi_tenancy/app/services/multi_tenancy/templates/serializers/nav_bar_item.rb +++ b/back/engines/commercial/multi_tenancy/app/services/multi_tenancy/templates/serializers/nav_bar_item.rb @@ -4,7 +4,7 @@ module MultiTenancy module Templates module Serializers class NavBarItem < Base - ref_attribute :static_page + ref_attributes %i[static_page project] attributes %i[code ordering title_multiloc] end end From 025665e29be9d16098c89acba0ccc2ebef0b22fc Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:04 +0100 Subject: [PATCH 24/55] New translations en.json (French) --- front/app/translations/admin/fr-FR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/fr-FR.json b/front/app/translations/admin/fr-FR.json index ed079c9de135..cce37190fe74 100644 --- a/front/app/translations/admin/fr-FR.json +++ b/front/app/translations/admin/fr-FR.json @@ -777,7 +777,7 @@ "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.pleaseSelectAProjectOrFolder": "Veuillez sélectionner un projet ou un dossier", "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.selectProjectOrFolder": "Sélectionnez un projet ou un dossier", "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.spotlight": "Pleins feux sur", - "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.title": "Nom", + "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.title": "Titre", "app.containers.Admin.project.Campaigns.campaignFrom": "De :", "app.containers.Admin.project.Campaigns.campaignTo": "À :", "app.containers.Admin.project.Campaigns.customEmails": "E-mails personnalisés", From 86b791397b77d8896479808fa562fa7292bd7d6a Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:07 +0100 Subject: [PATCH 25/55] New translations en.json (French) --- front/app/translations/fr-FR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/fr-FR.json b/front/app/translations/fr-FR.json index 0738b809d308..56f3d9043648 100644 --- a/front/app/translations/fr-FR.json +++ b/front/app/translations/fr-FR.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Ajouter un nouveau projet au projet {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Ajouter une nouvelle proposition au projet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Ajouter une nouvelle question au projet {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepter l'invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitation à soutenir", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Coparrainants", From 821f4289d8553767ee852beb7a642cc85c9c9830 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:11 +0100 Subject: [PATCH 26/55] New translations en.json (Spanish) --- front/app/translations/es-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/es-ES.json b/front/app/translations/es-ES.json index 51c8a2d0d9aa..ae3ef0a3f930 100644 --- a/front/app/translations/es-ES.json +++ b/front/app/translations/es-ES.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Añadir nuevo proyecto al proyecto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Añadir nueva propuesta al proyecto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Añadir una nueva pregunta al proyecto | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Acepta la invitación", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitación al copatrocinio", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Copatrocinadores", From 8681c2e8a8872646282e8ae5ffbf068070b0698d Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:15 +0100 Subject: [PATCH 27/55] New translations en.json (Arabic) --- front/app/translations/ar-SA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/ar-SA.json b/front/app/translations/ar-SA.json index 00997a281c2c..67aaa7d31a76 100644 --- a/front/app/translations/ar-SA.json +++ b/front/app/translations/ar-SA.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "إضافة مشروع جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "إضافة اقتراح جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "أضف سؤال جديد للمشروع | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "قبول الدعوة", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "دعوة للمشاركة في الرعاية", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "الرعاة المشاركون", From 0c5802b5ce8ae10f6bf32a77db2538e6a7d0803c Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:18 +0100 Subject: [PATCH 28/55] New translations en.json (Catalan) --- front/app/translations/ca-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/ca-ES.json b/front/app/translations/ca-ES.json index 9862a31d2ba6..737ea1787353 100644 --- a/front/app/translations/ca-ES.json +++ b/front/app/translations/ca-ES.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Afegeix un nou projecte al projecte | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Afegeix una nova proposta al projecte | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Afegeix una pregunta nova al projecte | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepta la invitació", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitació de copatrocini", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Copatrocinadors", From d4ec7e038ce7354c20631b6fd0890c140d742d0e Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:22 +0100 Subject: [PATCH 29/55] New translations en.json (Danish) --- front/app/translations/da-DK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/da-DK.json b/front/app/translations/da-DK.json index 0da5d147654e..2fd37f1f30c8 100644 --- a/front/app/translations/da-DK.json +++ b/front/app/translations/da-DK.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Tilføj nyt projekt til projekt | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Tilføj nyt forslag til projektet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Tilføj nyt spørgsmål til projektet | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepter invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitation til at blive medstiller", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Medstillere", From 0e55ce11c7b0c565c7d42098436f2bf69fa77b06 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:25 +0100 Subject: [PATCH 30/55] New translations en.json (German) --- front/app/translations/admin/de-DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/de-DE.json b/front/app/translations/admin/de-DE.json index 17339cf62971..25403735daab 100644 --- a/front/app/translations/admin/de-DE.json +++ b/front/app/translations/admin/de-DE.json @@ -133,7 +133,7 @@ "app.components.admin.PostManager.PostPreview.deleteInputInTimelineConfirmation": "Möchten Sie diesen Beitrag wirklich löschen? Er wird aus allen Projektphasen unwiderruflich gelöscht.", "app.components.admin.PostManager.PostPreview.edit": "Bearbeiten", "app.components.admin.PostManager.PostPreview.noOne": "Nicht zugewiesen", - "app.components.admin.PostManager.PostPreview.pbItemCountTooltip": "Wie oft ein Beitrag in die partizipativen Haushaltspläne anderer Teilnehmenden aufgenommen wurde", + "app.components.admin.PostManager.PostPreview.pbItemCountTooltip": "Wie oft ein Beitrag in den Warenkorb anderer Teilnehmenden aufgenommen wurde", "app.components.admin.PostManager.PostPreview.picks": "Auswahl: {picksNumber}", "app.components.admin.PostManager.PostPreview.reactionCounts": "Anzahl Reaktionen:", "app.components.admin.PostManager.PostPreview.save": "Speichern", From 23c9093556f0fb0b6f65370cdd3bc77a1763403c Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:27 +0100 Subject: [PATCH 31/55] New translations en.json (German) --- front/app/translations/de-DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/de-DE.json b/front/app/translations/de-DE.json index 6b2fb3aab736..ffa1d99a4699 100644 --- a/front/app/translations/de-DE.json +++ b/front/app/translations/de-DE.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Neues Projekt zum Projekt hinzufügen | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Neuen Vorschlag zum Projekt hinzufügen | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Neue Frage zum Projekt hinzufügen | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Einladung annehmen", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Einladung zum Unterstützen", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Unterstützer*innen", From 9702002c9202fb4171a646c902abc590e68ccec7 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:29 +0100 Subject: [PATCH 32/55] New translations en.json (Greek) --- front/app/translations/el-GR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/el-GR.json b/front/app/translations/el-GR.json index 02ebe6b58ddc..248fd8e23178 100644 --- a/front/app/translations/el-GR.json +++ b/front/app/translations/el-GR.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Προσθήκη νέου έργου στο έργο | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Προσθήκη νέας πρότασης στο έργο | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Προσθήκη νέας ερώτησης στο έργο | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Αποδοχή πρόσκλησης", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Πρόσκληση για συν-χορηγία", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Συν-χορηγοί", From 48196129a67e271ed0b45df5b1f3f74f0d247ca3 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:32 +0100 Subject: [PATCH 33/55] New translations en.json (Italian) --- front/app/translations/it-IT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/it-IT.json b/front/app/translations/it-IT.json index b841aba368a0..54f360dbd4b7 100644 --- a/front/app/translations/it-IT.json +++ b/front/app/translations/it-IT.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Aggiungi un nuovo progetto al progetto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Aggiungi una nuova proposta al progetto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Aggiungi una nuova domanda al progetto | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accetta l'invito", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invito alla co-sponsorizzazione", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsor", From df9bcf78d9701ec39f4d9d1c9141e0daee330f5a Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:36 +0100 Subject: [PATCH 34/55] New translations en.json (Dutch) --- front/app/translations/nl-NL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/nl-NL.json b/front/app/translations/nl-NL.json index fe7fd7918633..01f2f2bdaa07 100644 --- a/front/app/translations/nl-NL.json +++ b/front/app/translations/nl-NL.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Voeg nieuwe project toe aan project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Nieuw voorstel toevoegen aan project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Voeg nieuwe vraag toe aan project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Uitnodiging accepteren", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Uitnodiging tot ondersteuner", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Ondersteuners", From e0b11ba167c4d1619d45b59aa75d3418e6c5f4ee Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:41 +0100 Subject: [PATCH 35/55] New translations en.json (Punjabi) --- front/app/translations/pa-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/pa-IN.json b/front/app/translations/pa-IN.json index 29bf4f6a9e40..b73038381a81 100644 --- a/front/app/translations/pa-IN.json +++ b/front/app/translations/pa-IN.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਨਵਾਂ ਪ੍ਰੋਜੈਕਟ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਨਵਾਂ ਪ੍ਰਸਤਾਵ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਨਵਾਂ ਸਵਾਲ ਸ਼ਾਮਲ ਕਰੋ | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "ਸੱਦਾ ਸਵੀਕਾਰ ਕਰੋ", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "ਸਹਿ-ਸਪਾਂਸਰਸ਼ਿਪ ਦਾ ਸੱਦਾ", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "ਸਹਿ-ਪ੍ਰਾਯੋਜਕ", From 6cd4fd229fdb0df20b22f3fd0769b70ca295a8d2 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:45 +0100 Subject: [PATCH 36/55] New translations en.json (Polish) --- front/app/translations/pl-PL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/pl-PL.json b/front/app/translations/pl-PL.json index 6b84e275065a..3d9b0ce12637 100644 --- a/front/app/translations/pl-PL.json +++ b/front/app/translations/pl-PL.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Dodaj nowy projekt do projektu | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Dodaj nową propozycję do projektu | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Dodaj nowe pytanie do projektu | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Przyjmij zaproszenie", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Zaproszenie do współsponsorowania", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Współsponsorzy", From b6a21a2763ac247f11bd61c1cc8f82e11a992fb4 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:49 +0100 Subject: [PATCH 37/55] New translations en.json (Serbian (Cyrillic)) --- front/app/translations/sr-SP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/sr-SP.json b/front/app/translations/sr-SP.json index a1500fd3f6d2..5769615d016d 100644 --- a/front/app/translations/sr-SP.json +++ b/front/app/translations/sr-SP.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", From 8dc038d8992ada485ed81fc47ce698134eeb58a6 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:54 +0100 Subject: [PATCH 38/55] New translations en.json (Swedish) --- front/app/translations/sv-SE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/sv-SE.json b/front/app/translations/sv-SE.json index c38a91933193..d238ae7614a5 100644 --- a/front/app/translations/sv-SE.json +++ b/front/app/translations/sv-SE.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Lägg till nytt projekt till projekt | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Lägg till nytt förslag till projekt | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Lägg till ny fråga i projektet | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Acceptera inbjudan", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Inbjudan till medsponsring", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Medförslagsställare", From 833823f5087dc89492c5f4d58bdf9cbfe7b727df Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:58:58 +0100 Subject: [PATCH 39/55] New translations en.json (Turkish) --- front/app/translations/tr-TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/tr-TR.json b/front/app/translations/tr-TR.json index 0ce40827cdd2..388fe1a501a4 100644 --- a/front/app/translations/tr-TR.json +++ b/front/app/translations/tr-TR.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Projeye yeni proje ekle | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Projeye yeni teklif ekleyin | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Projeye yeni soru ekleyin | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Daveti kabul et", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Eş sponsorluk daveti", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Eş sponsorlar", From e333c9640ab566321973c3a4255d72131c0aafba Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:02 +0100 Subject: [PATCH 40/55] New translations en.json (Urdu (Pakistan)) --- front/app/translations/ur-PK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/ur-PK.json b/front/app/translations/ur-PK.json index 9eefbcd00103..9d975385880b 100644 --- a/front/app/translations/ur-PK.json +++ b/front/app/translations/ur-PK.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "پروجیکٹ میں نیا پروجیکٹ شامل کریں | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "پروجیکٹ میں نئی تجویز شامل کریں | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "پروجیکٹ میں نیا سوال شامل کریں | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "دعوت قبول کریں۔", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "شریک کفالت کی دعوت", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "شریک سپانسرز", From 17d9052e720f1cfccb48d4ba7f3562848bc15f03 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:07 +0100 Subject: [PATCH 41/55] New translations en.json (Portuguese, Brazilian) --- front/app/translations/pt-BR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/pt-BR.json b/front/app/translations/pt-BR.json index 3701a890eb0d..49c5e2dfb75b 100644 --- a/front/app/translations/pt-BR.json +++ b/front/app/translations/pt-BR.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Adicionar novo projeto ao projeto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Adicionar nova proposta ao projeto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Adicionar nova pergunta ao projeto | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Aceitar o convite", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Convite de copatrocínio", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-patrocinadores", From f7d8b955be5c868852b375eaf0449f54e14384c5 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:11 +0100 Subject: [PATCH 42/55] New translations en.json (Spanish, Chile) --- front/app/translations/es-CL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/es-CL.json b/front/app/translations/es-CL.json index 758e6d556a18..7e2831deb820 100644 --- a/front/app/translations/es-CL.json +++ b/front/app/translations/es-CL.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Añadir nuevo proyecto al proyecto | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Añadir nueva propuesta al proyecto | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Añadir una nueva pregunta al proyecto | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Acepta la invitación", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitación al copatrocinio", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Copatrocinadores", From 8a5368cc90c43cd504fe4820d6fb9e7abc41cb54 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:15 +0100 Subject: [PATCH 43/55] New translations en.json (Latvian) --- front/app/translations/lv-LV.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/lv-LV.json b/front/app/translations/lv-LV.json index ca72ed4e9dcd..5431d78d4ed2 100644 --- a/front/app/translations/lv-LV.json +++ b/front/app/translations/lv-LV.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Pievienot jaunu projektu projektam | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Pievienot jaunu priekšlikumu projektam | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Pievienot jaunu jautājumu projektam | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Pieņemt ielūgumu", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Līdzfinansējuma uzaicinājums", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Līdzfinansētāji", From dc0176cb01537beba589a26210d3654ed3c801e1 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:19 +0100 Subject: [PATCH 44/55] New translations en.json (English, Canada) --- front/app/translations/en-CA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/en-CA.json b/front/app/translations/en-CA.json index a97e8f29c0bc..2ac906f5ab27 100644 --- a/front/app/translations/en-CA.json +++ b/front/app/translations/en-CA.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", From 771997381c86dc79fa6c42fe010b4906d90c611b Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:24 +0100 Subject: [PATCH 45/55] New translations en.json (English, United Kingdom) --- front/app/translations/en-GB.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/en-GB.json b/front/app/translations/en-GB.json index 1d953f73e772..bbe793319aeb 100644 --- a/front/app/translations/en-GB.json +++ b/front/app/translations/en-GB.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", From a87fcff2fc1e3f0ad276e21fd543431440309e5b Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:27 +0100 Subject: [PATCH 46/55] New translations en.json (Norwegian Bokmal) --- front/app/translations/admin/nb-NO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/nb-NO.json b/front/app/translations/admin/nb-NO.json index 98a2d90b2d8d..e2f0abc33acd 100644 --- a/front/app/translations/admin/nb-NO.json +++ b/front/app/translations/admin/nb-NO.json @@ -315,7 +315,7 @@ "app.components.app.containers.AdminPage.ProjectEdit.minVotesRequired": "Det kreves et minimum antall stemmer", "app.components.app.containers.AdminPage.ProjectEdit.missingEndDateError": "Manglende sluttdato", "app.components.app.containers.AdminPage.ProjectEdit.missingStartDateError": "Mangler startdato", - "app.components.app.containers.AdminPage.ProjectEdit.optionTerm": "Alternativ", + "app.components.app.containers.AdminPage.ProjectEdit.optionTerm": "Innspill", "app.components.app.containers.AdminPage.ProjectEdit.optionsPageText2": "Fanen Input Manager", "app.components.app.containers.AdminPage.ProjectEdit.optionsToVoteOnDescWihoutPhase": "Konfigurer avstemningsalternativene i fanen Input manager etter at du har opprettet en fase.", "app.components.app.containers.AdminPage.ProjectEdit.optionsToVoteOnDescription2": "Konfigurer avstemningsalternativene i {optionsPageLink}.", From ffdcc174dc0d49b86d2d29a3e3fac8f9ee72e3e9 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:28 +0100 Subject: [PATCH 47/55] New translations en.json (Norwegian Bokmal) --- front/app/translations/nb-NO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/nb-NO.json b/front/app/translations/nb-NO.json index 829983de6112..ae9540aad70b 100644 --- a/front/app/translations/nb-NO.json +++ b/front/app/translations/nb-NO.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Legg til nytt prosjekt i prosjekt | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Legg til nytt forslag i prosjektet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Legg til nytt spørsmål i prosjektet | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Godta invitasjon", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitasjon til medsponsorskap", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Medsponsorer", From a5e30d53525f90c6f8badf7b799027f8f84ccf4e Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:32 +0100 Subject: [PATCH 48/55] New translations en.json (Serbian (Latin)) --- front/app/translations/sr-Latn.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/sr-Latn.json b/front/app/translations/sr-Latn.json index 76618f6011b0..7d22c5d176de 100644 --- a/front/app/translations/sr-Latn.json +++ b/front/app/translations/sr-Latn.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", From 1a52c5046529cf980c5899cac43bfa90973a800e Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:37 +0100 Subject: [PATCH 49/55] New translations en.json (Dutch, Belgium) --- front/app/translations/nl-BE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/nl-BE.json b/front/app/translations/nl-BE.json index 15662b5f5c79..4c982438597f 100644 --- a/front/app/translations/nl-BE.json +++ b/front/app/translations/nl-BE.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Voeg nieuwe project toe aan project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Nieuw voorstel toevoegen aan project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Voeg nieuwe vraag toe aan project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Uitnodiging accepteren", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Uitnodiging tot ondersteuner", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Ondersteuners", From f1e71eb0c4328a2df62b7abce5ad3ee54d6bb560 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:41 +0100 Subject: [PATCH 50/55] New translations en.json (English, Ireland) --- front/app/translations/en-IE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/en-IE.json b/front/app/translations/en-IE.json index 26a6bb7b869f..3d829bf244fa 100644 --- a/front/app/translations/en-IE.json +++ b/front/app/translations/en-IE.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Add new project to project | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Add new proposal to project | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Add new question to project | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accept invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Co-sponsorship invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Co-sponsors", From 67103434ada83a3010ea4b213d3fe9fa326bccfd Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:45 +0100 Subject: [PATCH 51/55] New translations en.json (French, Belgium) --- front/app/translations/admin/fr-BE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/fr-BE.json b/front/app/translations/admin/fr-BE.json index cdadf674be25..b2498e24383b 100644 --- a/front/app/translations/admin/fr-BE.json +++ b/front/app/translations/admin/fr-BE.json @@ -777,7 +777,7 @@ "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.pleaseSelectAProjectOrFolder": "Veuillez sélectionner un projet ou un dossier", "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.selectProjectOrFolder": "Sélectionnez un projet ou un dossier", "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.spotlight": "Pleins feux sur", - "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.title": "Nom", + "app.containers.Admin.pagesAndMenu.containers.ContentBuilder.components.CraftComponents.SpotlightProject.title": "Titre", "app.containers.Admin.project.Campaigns.campaignFrom": "De :", "app.containers.Admin.project.Campaigns.campaignTo": "À :", "app.containers.Admin.project.Campaigns.customEmails": "E-mails personnalisés", From 1ef7ab2fe6a1f7a49a79ac7df4c959dcf2515750 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:46 +0100 Subject: [PATCH 52/55] New translations en.json (French, Belgium) --- front/app/translations/fr-BE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/fr-BE.json b/front/app/translations/fr-BE.json index 730e3c89e891..f5124f9f2f08 100644 --- a/front/app/translations/fr-BE.json +++ b/front/app/translations/fr-BE.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "Ajouter un nouveau projet au projet {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "Ajouter une nouvelle proposition au projet | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "Ajouter une nouvelle question au projet {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "Accepter l'invitation", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "Invitation à soutenir", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "Coparrainants", From 6b25a4e05267e69b58e488fae4d0376f111c7ecb Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:50 +0100 Subject: [PATCH 53/55] New translations en.json (Moroccan Arabic) --- front/app/translations/ar-MA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/ar-MA.json b/front/app/translations/ar-MA.json index c808cc9b95ff..0ebe90b3bd5b 100644 --- a/front/app/translations/ar-MA.json +++ b/front/app/translations/ar-MA.json @@ -1298,6 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "إضافة مشروع جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.proposalMetaTitle1": "إضافة اقتراح جديد للمشروع | {orgName}", "app.containers.IdeasNewPage.questionMetaTitle1": "أضف سؤال جديد للمشروع | {orgName}", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "{surveyTitle} | {orgName}", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "قبول الدعوة", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "دعوة للمشاركة في الرعاية", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "الرعاة المشاركون", From 8efba35ba566afb542032fd80d3643aaa7985a2a Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:58 +0100 Subject: [PATCH 54/55] New translations en.json (Acholi) --- front/app/translations/admin/ach-UG.json | 1 - 1 file changed, 1 deletion(-) diff --git a/front/app/translations/admin/ach-UG.json b/front/app/translations/admin/ach-UG.json index d9546e7c6dd0..e622f3e570e8 100644 --- a/front/app/translations/admin/ach-UG.json +++ b/front/app/translations/admin/ach-UG.json @@ -2019,7 +2019,6 @@ "app.containers.AdminPage.SettingsPage.linkToActivityPageText": "crwdns211902:0crwdne211902:0", "app.containers.AdminPage.SettingsPage.logo": "crwdns211904:0crwdne211904:0", "app.containers.AdminPage.SettingsPage.noHeader": "crwdns211906:0crwdne211906:0", - "app.containers.AdminPage.SettingsPage.noLogo": "crwdns211908:0crwdne211908:0", "app.containers.AdminPage.SettingsPage.no_button": "crwdns211910:0crwdne211910:0", "app.containers.AdminPage.SettingsPage.organizationName": "crwdns211912:0crwdne211912:0", "app.containers.AdminPage.SettingsPage.organizationNameMultilocError": "crwdns211914:0crwdne211914:0", From fbceb481cbc80299586abe15641e8efcd615f539 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:59:59 +0100 Subject: [PATCH 55/55] New translations en.json (Acholi) --- front/app/translations/ach-UG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/ach-UG.json b/front/app/translations/ach-UG.json index b26951945daf..1f875525482b 100644 --- a/front/app/translations/ach-UG.json +++ b/front/app/translations/ach-UG.json @@ -1298,7 +1298,7 @@ "app.containers.IdeasNewPage.projectMetaTitle1": "crwdns2278738:0{orgName}crwdne2278738:0", "app.containers.IdeasNewPage.proposalMetaTitle1": "crwdns3335179:0{orgName}crwdne3335179:0", "app.containers.IdeasNewPage.questionMetaTitle1": "crwdns2278740:0{orgName}crwdne2278740:0", - "app.containers.IdeasNewPage.surveyNewMetaTitle1": "crwdns2278742:0{orgName}crwdne2278742:0", + "app.containers.IdeasNewPage.surveyNewMetaTitle2": "crwdns3420703:0{surveyTitle}crwdnd3420703:0{orgName}crwdne3420703:0", "app.containers.IdeasShow.Cosponsorship.co-sponsorAcceptInvitation": "crwdns3238309:0crwdne3238309:0", "app.containers.IdeasShow.Cosponsorship.co-sponsorInvitation": "crwdns3238311:0crwdne3238311:0", "app.containers.IdeasShow.Cosponsorship.co-sponsors": "crwdns3238313:0crwdne3238313:0",