address copilot i18n comments

Author: dnywh

.github/workflows/validate-app.yml

@@ -27,3 +27,6 @@ jobs:
 
       - name: Run app checks
         run: npm run check
+
+      - name: Build app
+        run: npm run build

messages/de.json

@@ -74,7 +74,7 @@
   },
   "Errors": {
     "alreadyYourEmail": "Das ist bereits deine E-Mail-Adresse.",
-    "emptyListingName": "Der Name für {type} darf nicht leer sein.",
+    "emptyListingName": "{type, select, business {Der Name des Unternehmens darf nicht leer sein.} community {Der Name der Community darf nicht leer sein.} other {Der Name des Eintrags darf nicht leer sein.}}",
     "emptyName": "Der Name darf nicht leer sein.",
     "accountDeleted": "Dein Konto wurde gelöscht. Schade, dass du gehst.",
     "accountExists": "Ein Konto mit dieser E-Mail existiert bereits. Bitte melde dich stattdessen an.",
@@ -164,8 +164,8 @@
   "Profile": {
     "addListing": "Eintrag hinzufügen",
     "addAnotherListing": "Weiteren Eintrag hinzufügen",
-    "listingCardAlt": "Dein Avatar für diesen {type}-Eintrag",
-    "listingCardType": "{type}-Eintrag",
+    "listingCardAlt": "{type, select, residential {Dein Avatar für diesen Wohneintrag} community {Dein Avatar für diesen Community-Eintrag} business {Dein Avatar für diesen Unternehmenseintrag} other {Dein Avatar für diesen Eintrag}}",
+    "listingCardType": "{type, select, residential {Wohneintrag} community {Community-Eintrag} business {Unternehmenseintrag} other {Eintrag}}",
     "listingPrompt": "Setze dich, deinen Gemeinschaftsort oder dein Unternehmen auf die Karte",
     "sections": {
       "listings": "Einträge",
@@ -260,13 +260,13 @@
     "form": {
       "basics": "Grundlagen",
       "placeName": "Name des Ortes",
-      "placeNamePlaceholder": "Name deines {type}",
+      "placeNamePlaceholder": "{type, select, business {Name deines Unternehmens} community {Name deiner Community} other {Name des Ortes}}",
       "yourFirstName": "Dein Vorname",
       "location": "Standort",
       "selectCountry": "Land auswählen",
       "locationPlaceholder": "Deine Straße oder ein Ort in der Nähe",
       "customLocation": "Benutzerdefinierter Standort",
-      "locationHint": "Beginne zu tippen und wähle dann einen der vorgeschlagenen {kind} aus dem Menü.",
+      "locationHint": "{type, select, residential {Beginne zu tippen und wähle dann eine der vorgeschlagenen Optionen aus dem Menü.} other {Beginne zu tippen und wähle dann eine der vorgeschlagenen Adressen aus dem Menü.}}",
       "dragPinHint": "Ziehe die Markierung, um deinen Standort zu verfeinern{obscure, select, true { oder zu verschleiern} other {}}.",
       "businessAddress": "Adresse deines Unternehmens",
       "communityAddress": "Adresse deiner Gemeinschaft",
@@ -275,7 +275,7 @@
       "donationDetailsPlaceholder": "Details zu deiner Spende",
       "donationDetailsHint": "Welche Reste du abgeben möchtest und wie die Abholung funktioniert. Links gehören in den eigenen Abschnitt weiter unten.",
       "descriptionLabel": "Kurze Beschreibung oder Hinweise",
-      "descriptionPlaceholder": "Über deinen {type}",
+      "descriptionPlaceholder": "{type, select, residential {Über deinen Eintrag} community {Über deine Community} business {Über dein Unternehmen} other {Über deinen Eintrag}}",
       "communityDescriptionHint": "Öffnungszeiten und Kompostiermöglichkeiten. Hebe die akzeptierten Reste und Links für die eigenen Abschnitte weiter unten auf.",
       "residentialDescriptionHint": "Dein Kompost-Setup und deine allgemeine Verfügbarkeit. Hebe die akzeptierten Reste für den eigenen Abschnitt weiter unten auf.",
       "compostingDetails": "Kompostierungsdetails",

messages/en.json

@@ -74,7 +74,7 @@
   },
   "Errors": {
     "alreadyYourEmail": "This is already your email address.",
-    "emptyListingName": "You can't have an empty {type} name.",
+    "emptyListingName": "{type, select, business {You can't have an empty business name.} community {You can't have an empty community name.} other {You can't have an empty listing name.}}",
     "emptyName": "You can’t have an empty name.",
     "accountDeleted": "Your account has been deleted. Sorry to see you go.",
     "accountExists": "An account with this email already exists. Please sign in instead.",
@@ -164,8 +164,8 @@
   "Profile": {
     "addListing": "Add a listing",
     "addAnotherListing": "Add another listing",
-    "listingCardAlt": "Your avatar for this {type} listing",
-    "listingCardType": "{type} listing",
+    "listingCardAlt": "{type, select, residential {Your avatar for this residential listing} community {Your avatar for this community listing} business {Your avatar for this business listing} other {Your avatar for this listing}}",
+    "listingCardType": "{type, select, residential {Residential listing} community {Community listing} business {Business listing} other {Listing}}",
     "listingPrompt": "Put yourself, your community spot, or your business on the map",
     "sections": {
       "listings": "Listings",
@@ -260,13 +260,13 @@
     "form": {
       "basics": "Basics",
       "placeName": "Place name",
-      "placeNamePlaceholder": "Your {type} name",
+      "placeNamePlaceholder": "{type, select, business {Your business’ name} community {Your community’s name} other {Your place name}}",
       "yourFirstName": "Your first name",
       "location": "Location",
       "selectCountry": "Select a country",
       "locationPlaceholder": "Your street name or nearby",
       "customLocation": "Custom location",
-      "locationHint": "Start typing, then select one of the suggested {kind} from the dropdown.",
+      "locationHint": "{type, select, residential {Start typing, then select one of the suggested options from the dropdown.} other {Start typing, then select one of the suggested addresses from the dropdown.}}",
       "dragPinHint": "Drag the pin to refine{obscure, select, true { or obscure} other {}} your location.",
       "businessAddress": "Your business’ address",
       "communityAddress": "Your community’s address",
@@ -275,7 +275,7 @@
       "donationDetailsPlaceholder": "Your donation details",
       "donationDetailsHint": "What kind of scraps you have to give away and the collection details. Save any links for the dedicated section, below.",
       "descriptionLabel": "Short description or instructions",
-      "descriptionPlaceholder": "About your {type}",
+      "descriptionPlaceholder": "{type, select, residential {About your listing} community {About your community} business {About your business} other {About your listing}}",
       "communityDescriptionHint": "Opening hours and composting facilities. Save the scraps you accept and any links for the dedicated sections, below.",
       "residentialDescriptionHint": "Your composting set up and general availability. Save the scraps you accept for the dedicated section, below.",
       "compostingDetails": "Composting details",

messages/es.json

@@ -74,7 +74,7 @@
   },
   "Errors": {
     "alreadyYourEmail": "Esta ya es tu dirección de correo electrónico.",
-    "emptyListingName": "No puedes dejar vacío el nombre de {type}.",
+    "emptyListingName": "{type, select, business {No puedes dejar vacío el nombre del negocio.} community {No puedes dejar vacío el nombre de la comunidad.} other {No puedes dejar vacío el nombre del anuncio.}}",
     "emptyName": "No puedes dejar el nombre vacío.",
     "accountDeleted": "Tu cuenta ha sido eliminada. Sentimos verte partir.",
     "accountExists": "Ya existe una cuenta con este correo. Inicia sesión en su lugar.",
@@ -164,8 +164,8 @@
   "Profile": {
     "addListing": "Agregar un anuncio",
     "addAnotherListing": "Agregar otro anuncio",
-    "listingCardAlt": "Tu avatar para este anuncio de {type}",
-    "listingCardType": "Anuncio de {type}",
+    "listingCardAlt": "{type, select, residential {Tu avatar para este anuncio residencial} community {Tu avatar para este anuncio comunitario} business {Tu avatar para este anuncio de negocio} other {Tu avatar para este anuncio}}",
+    "listingCardType": "{type, select, residential {Anuncio residencial} community {Anuncio comunitario} business {Anuncio de negocio} other {Anuncio}}",
     "listingPrompt": "Ponte a ti, a tu espacio comunitario o a tu negocio en el mapa",
     "sections": {
       "listings": "Anuncios",
@@ -260,13 +260,13 @@
     "form": {
       "basics": "Datos básicos",
       "placeName": "Nombre del lugar",
-      "placeNamePlaceholder": "Nombre de tu {type}",
+      "placeNamePlaceholder": "{type, select, business {Nombre de tu negocio} community {Nombre de tu comunidad} other {Nombre del lugar}}",
       "yourFirstName": "Tu nombre",
       "location": "Ubicación",
       "selectCountry": "Selecciona un país",
       "locationPlaceholder": "Tu calle o un lugar cercano",
       "customLocation": "Ubicación personalizada",
-      "locationHint": "Empieza a escribir y selecciona una de las {kind} sugeridas en el menú.",
+      "locationHint": "{type, select, residential {Empieza a escribir y selecciona una de las opciones sugeridas en el menú.} other {Empieza a escribir y selecciona una de las direcciones sugeridas en el menú.}}",
       "dragPinHint": "Arrastra el pin para ajustar{obscure, select, true { u ocultar} other {}} tu ubicación.",
       "businessAddress": "Dirección de tu negocio",
       "communityAddress": "Dirección de tu comunidad",
@@ -275,7 +275,7 @@
       "donationDetailsPlaceholder": "Detalles de tu donación",
       "donationDetailsHint": "Qué tipo de restos tienes para donar y los detalles de recogida. Guarda los enlaces para la sección dedicada, más abajo.",
       "descriptionLabel": "Descripción breve o instrucciones",
-      "descriptionPlaceholder": "Acerca de tu {type}",
+      "descriptionPlaceholder": "{type, select, residential {Acerca de tu anuncio} community {Acerca de tu comunidad} business {Acerca de tu negocio} other {Acerca de tu anuncio}}",
       "communityDescriptionHint": "Horarios de apertura e instalaciones de compostaje. Guarda los restos que aceptas y cualquier enlace para las secciones dedicadas, más abajo.",
       "residentialDescriptionHint": "Tu sistema de compostaje y disponibilidad general. Guarda los restos que aceptas para la sección dedicada, más abajo.",
       "compostingDetails": "Detalles de compostaje",

src/components/Label/Label.jsx src/components/Label/Label.tsxsrc/components/Label/Label.jsx renamed to src/components/Label/Label.tsx

@@ -1,6 +1,6 @@
 import { Label as HeadlessLabel } from "@headlessui/react";
 import { styled } from "@pigment-css/react";
-import { useTranslations } from "next-intl";
+import type { ComponentProps, ReactNode } from "react";
 
 const StyledLabel = styled(HeadlessLabel)(({ theme }) => ({
   color: theme.colors.text.ui.primary,
@@ -12,12 +12,21 @@ const StyledLabel = styled(HeadlessLabel)(({ theme }) => ({
   },
 }));
 
-export default function Label({ required = true, children, ...props }) {
-  const t = useTranslations("Common");
+type LabelProps = ComponentProps<typeof HeadlessLabel> & {
+  required?: boolean;
+  optionalText?: string;
+  children: ReactNode;
+};
 
+export default function Label({
+  required = true,
+  optionalText = "",
+  children,
+  ...props
+}: LabelProps) {
   return (
     <StyledLabel {...props}>
-      {children} {!required && <span>({t("optional")})</span>}
+      {children} {!required && optionalText && <span>({optionalText})</span>}
     </StyledLabel>
   );
 }

…c/components/LegalFooter/LegalFooter.jsx …c/components/LegalFooter/LegalFooter.tsxsrc/components/LegalFooter/LegalFooter.jsx renamed to src/components/LegalFooter/LegalFooter.tsx src/components/LegalFooter/LegalFooter.jsx renamed to src/components/LegalFooter/LegalFooter.tsx

@@ -2,12 +2,12 @@ import { siteConfig } from "@/config/site";
 import Link from "next/link";
 import PeelsLogo from "@/components/PeelsLogo";
 import { styled } from "@pigment-css/react";
-import { useTranslations } from "next-intl";
+import { getTranslations } from "next-intl/server";
 
 const currentYear = new Date().getFullYear();
 
-export default function LegalFooter() {
-  const t = useTranslations();
+export default async function LegalFooter() {
+  const t = await getTranslations();
 
   return (
     <StyledFooter>

src/components/ListingWrite/ListingWrite.tsx

@@ -401,10 +401,7 @@ export default function ListingWrite({
                 type="text"
                 minLength={FIELD_CONFIGS.firstName.minLength}
                 placeholder={t("Listings.form.placeNamePlaceholder", {
-                  type:
-                    listingType === "business"
-                      ? "business’"
-                      : `${listingType}’s`,
+                  type: listingType,
                 })}
                 value={name}
                 onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
@@ -463,7 +460,11 @@ export default function ListingWrite({
             </Field>
           ) : (
             <Field>
-              <Label htmlFor="description" required={false}>
+              <Label
+                htmlFor="description"
+                required={false}
+                optionalText={t("Common.optional")}
+              >
                 {t("Listings.form.descriptionLabel")}
               </Label>
               <TextareaComponent
@@ -473,7 +474,7 @@ export default function ListingWrite({
                 required={false}
                 resize="vertical"
                 placeholder={t("Listings.form.descriptionPlaceholder", {
-                  type: listingType === "residential" ? "listing" : listingType,
+                  type: listingType,
                 })}
                 value={description}
                 onChange={(event: React.ChangeEvent<HTMLTextAreaElement>) =>
@@ -500,6 +501,7 @@ export default function ListingWrite({
               label={t("Listings.form.acceptedLabel")}
               addButtonText={t("Listings.form.addItem")}
               addAnotherButtonText={t("Listings.form.addAnotherItem")}
+              optionalText={t("Common.optional")}
               placeholder={t("Listings.form.acceptedPlaceholder")}
               secondaryPlaceholder={t(
                 "Listings.form.acceptedSecondaryPlaceholder"
@@ -515,6 +517,7 @@ export default function ListingWrite({
               label={t("Listings.form.rejectedLabel")}
               addButtonText={t("Listings.form.addItem")}
               addAnotherButtonText={t("Listings.form.addAnotherItem")}
+              optionalText={t("Common.optional")}
               placeholder={t("Listings.form.rejectedPlaceholder")}
               secondaryPlaceholder={t(
                 "Listings.form.rejectedSecondaryPlaceholder"
@@ -543,7 +546,11 @@ export default function ListingWrite({
           </FormSectionHeader>
 
           <FieldsetWithGap>
-            <Label htmlFor="photo-upload-button" required={false}>
+            <Label
+              htmlFor="photo-upload-button"
+              required={false}
+              optionalText={t("Common.optional")}
+            >
               {t("Common.photos")}
             </Label>
             <ListingPhotosManagerComponent
@@ -560,6 +567,7 @@ export default function ListingWrite({
               label={t("Listings.form.externalLinks")}
               required={false}
               addButtonText={t("Listings.form.addLink")}
+              optionalText={t("Common.optional")}
               placeholder={t("Listings.form.linkPlaceholder")}
               items={links}
               handleItemChange={handleLinksChange}