From a2254bb5519454ce9b162457b2395ea4c702b758 Mon Sep 17 00:00:00 2001 From: "D. Ror" Date: Fri, 5 Jul 2024 15:49:14 -0400 Subject: [PATCH 1/2] Override MUI default to make button text all-caps --- src/types/theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/theme.ts b/src/types/theme.ts index 004b866e65..cf4cdb2ef3 100644 --- a/src/types/theme.ts +++ b/src/types/theme.ts @@ -52,7 +52,7 @@ const baseTheme = createTheme({ }, palette, spacing: 8, - typography: { fontFamily }, + typography: { button: { textTransform: "none" }, fontFamily }, }); // Can have a number of additional options passed in; here, sticks with defaults From 6c2672ac09a3a4066d25728d1ab32b683d506b4d Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Fri, 5 Jul 2024 16:06:55 -0400 Subject: [PATCH 2/2] Fix button text capitalization --- docs/user_guide/docs/account.es.md | 2 +- docs/user_guide/docs/account.md | 2 +- docs/user_guide/docs/goals.es.md | 6 +++--- docs/user_guide/docs/goals.md | 12 ++++++------ docs/user_guide/docs/project.es.md | 2 +- docs/user_guide/docs/project.md | 2 +- public/locales/en/translation.json | 10 +++++----- public/locales/es/translation.json | 10 +++++----- public/locales/fr/translation.json | 10 +++++----- public/locales/pt/translation.json | 10 +++++----- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/user_guide/docs/account.es.md b/docs/user_guide/docs/account.es.md index 8e8b617c36..bd77fed9bc 100644 --- a/docs/user_guide/docs/account.es.md +++ b/docs/user_guide/docs/account.es.md @@ -6,7 +6,7 @@ Cómo registrarse, iniciar sesión y editar su cuenta. ## Registrarse -Para crear una nueva cuenta, pulse el botón [REGISTRARSE](../../signup) en la página de inicio de sesión. +Para crear una nueva cuenta, pulse el botón [Registrarse](../../signup) en la página de inicio de sesión. !!! note "Nota" diff --git a/docs/user_guide/docs/account.md b/docs/user_guide/docs/account.md index 232b141a9e..ec257c1210 100644 --- a/docs/user_guide/docs/account.md +++ b/docs/user_guide/docs/account.md @@ -6,7 +6,7 @@ How to sign up, log in, and edit your account. ## Sign Up -To create a new account, click the [SIGN UP](../signup) button on the Login page. +To create a new account, click the [Sign Up](../signup) button on the Login page. !!! note "Note" diff --git a/docs/user_guide/docs/goals.es.md b/docs/user_guide/docs/goals.es.md index 893ec18054..54d2fc79ff 100644 --- a/docs/user_guide/docs/goals.es.md +++ b/docs/user_guide/docs/goals.es.md @@ -217,13 +217,13 @@ El centro del panel muestra hasta 5 ejemplos de formas vernáculas en las que ap en cada ocurrencia. En la parte superior del panel hay tres botones para designar si el carácter debe incluirse en el inventario de -caracteres de la lengua vernácula: "ACEPTAR", "NO DECIDIDO" y "RECHAZAR". Al pulsar cualquiera de estos botones se +caracteres de la lengua vernácula: "Aceptar", "No decidido" y "Rechazar". Al pulsar cualquiera de estos botones se actualizará la designación en la parte inferior de la ficha de personaje. (Estas actualizaciones del inventario del -personaje no se guardan en el proyecto hasta que pulse el botón GUARDAR en la parte inferior de la página) +personaje no se guardan en el proyecto hasta que pulse el botón Guardar en la parte inferior de la página) En la parte inferior del panel se encuentra la herramienta Buscar y Reemplazar. Si _cada_ aparición del carácter debe sustituirse por otra cosa, escriba el carácter o cadena de sustitución en la casilla "Sustituir por" y pulse el botón -APLICAR. +Aplicar. !!! warning "Importante" diff --git a/docs/user_guide/docs/goals.md b/docs/user_guide/docs/goals.md index 7a7cefb8c8..c2e2d23cf9 100644 --- a/docs/user_guide/docs/goals.md +++ b/docs/user_guide/docs/goals.md @@ -124,10 +124,10 @@ next set: "Save & Continue" and "Defer". #### Save & Continue -![Merge Duplicates Save and Continue button](images/mergeSaveAndContinue.png) +![Merge Duplicates Save & Continue button](images/mergeSaveAndContinue.png) -The blue "Save and Continue" button does two things. First, it saves all changes made (i.e., all moved, merged, or -deleted senses), updating the words in the database. Second, it saves the resulting set of words as non-duplicates. +The blue "Save & Continue" button does two things. First, it saves all changes made (i.e., all moved, merged, or deleted +senses), updating the words in the database. Second, it saves the resulting set of words as non-duplicates. !!! tip "Tip" @@ -211,12 +211,12 @@ The middle of the panel shows up to 5 example vernacular forms in which the char in each occurrence. At the top of the panel are three buttons for designating whether the character should be included in the vernacular -language's character inventory: "ACCEPT", "UNDECIDED", and "REJECT". Pressing any of these buttons will update the +language's character inventory: "Accept", "Undecided", and "Reject". Pressing any of these buttons will update the designation at the bottom of the character tile. (These updates to the character inventory are not saved to the project -until you click the SAVE button at the bottom of the page.) +until you click the Save button at the bottom of the page.) At the bottom of the panel is a Find-and-Replace tool. If _every_ occurrence of the character should be replaced with -something else, type the replacement character or string in the "Replace with" box and click the APPLY button. +something else, type the replacement character or string in the "Replace with" box and click the Apply button. !!! warning "Important" diff --git a/docs/user_guide/docs/project.es.md b/docs/user_guide/docs/project.es.md index c784620fa8..d019aed756 100644 --- a/docs/user_guide/docs/project.es.md +++ b/docs/user_guide/docs/project.es.md @@ -12,7 +12,7 @@ Al crear un proyecto, tiene la opción de empezar con un proyecto vacío o de im Si tiene datos léxicos en un archivo [LIFT](https://software.sil.org/lifttools) (probablemente exportado de The Combine, [WeSay](https://software.sil.org/wesay), [FLEx](https://software.sil.org/fieldworks) o -[Lexique Pro](https://software.sil.org/lexiquepro)), puede hacer clic en el botón BROWSE junto a "¿Cargar los datos +[Lexique Pro](https://software.sil.org/lexiquepro)), puede hacer clic en el botón Navegar junto a "¿Cargar los datos existentes?" para importar los datos a su proyecto. Si decide no importar datos durante la creación del proyecto, podrá hacerlo más adelante (véase [más abajo](#import)). diff --git a/docs/user_guide/docs/project.md b/docs/user_guide/docs/project.md index 33f834771f..ff868822d2 100644 --- a/docs/user_guide/docs/project.md +++ b/docs/user_guide/docs/project.md @@ -12,7 +12,7 @@ When creating a project, you have the option to start with an empty project or t If you have lexical data in a [LIFT](https://software.sil.org/lifttools) file (likely exported from The Combine, [WeSay](https://software.sil.org/wesay), [FLEx](https://software.sil.org/fieldworks), or -[Lexique Pro](https://software.sil.org/lexiquepro)), you can click the BROWSE button next to "Upload existing data?" to +[Lexique Pro](https://software.sil.org/lexiquepro)), you can click the Browse button next to "Upload existing data?" to import the data into your project. If you choose not to import data during project creation, you may still do so later (see [below](#import)). diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 69b9b69a0f..ab8ee5a82a 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -357,13 +357,13 @@ "replaceAllWith": "Replace with: {{ val }}", "findAndReplace": "Find & Replace", "findAndReplaceError": "Error processing: find ( {{ val1 }} ), replace ( {{ val2 }} )", - "apply": "apply" + "apply": "Apply" }, "dialog": { "title": "Unsaved changes", "content": "Discard your changes to the character set?", - "yes": "yes", - "no": "no" + "yes": "Yes", + "no": "No" }, "changes": { "noCharChanges": "No changes made to character inventory.", @@ -427,8 +427,8 @@ }, "continueDialog": { "title": "Continue merging?", - "yes": "yes", - "no": "no" + "yes": "Yes", + "no": "No" }, "undo": { "undo": "Undo Merge", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index c1bb5cc9ea..2b72874dd0 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -324,13 +324,13 @@ "replaceAllWith": "Reemplazar con: {{ val }}", "findAndReplace": "Buscar y Reemplazar", "findAndReplaceError": "Error al procesar: encontrar ( {{ val1 }} ), reemplazar ( {{ val2 }})", - "apply": "aplicar" + "apply": "Aplicar" }, "dialog": { "title": "Cambios no guardados", "content": "¿Descartar sus cambios en el conjunto de caracteres?", - "yes": "si", - "no": "no" + "yes": "Si", + "no": "No" }, "changes": { "noCharChanges": "No se han realizado cambios en el inventario de caracteres.", @@ -392,8 +392,8 @@ "completed": { "number": "Número de combinaciones realizadas: " }, "continueDialog": { "title": "¿Continuar con la combinación?", - "yes": "si", - "no": "no" + "yes": "Si", + "no": "No" }, "undo": { "undo": "Deshacer la combinación", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index aeaa5394bc..d79809822d 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -256,13 +256,13 @@ "replaceAll": "Remplacer toute instance de : {{ val }}", "replaceAllWith": "Remplacer par : {{ val }}", "findAndReplace": "Rechercher et Remplacer", - "apply": "appliquer" + "apply": "Appliquer" }, "dialog": { "title": "Modifications non sauvegardées", "content": "Supprimer les modifications apportées au jeu de caractères ?", - "yes": "oui", - "no": "non" + "yes": "Oui", + "no": "Non" }, "changes": { "more": "plus" }, "undo": { "undoDisabled": "Annuler indisponible" } @@ -285,8 +285,8 @@ "completed": { "number": "Nombre de fusions réalisées : " }, "continueDialog": { "title": "Poursuivre la fusion ?", - "yes": "oui", - "no": "non" + "yes": "Oui", + "no": "Non" }, "undo": { "undo": "Annuler la fusion", diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json index 107be5ba77..f61f914c70 100644 --- a/public/locales/pt/translation.json +++ b/public/locales/pt/translation.json @@ -246,13 +246,13 @@ "replaceAll": "Substituir todas as ocorrências de: {{ val }}", "replaceAllWith": "Substituir por: {{ val }}", "findAndReplace": "Localizar & Substituir", - "apply": "aplicar" + "apply": "Aplicar" }, "dialog": { "title": "Alterações não salvas", "content": "Descartar alterações feitas no conjunto de caracteres?", - "yes": "sim", - "no": "não" + "yes": "Sim", + "no": "Não" }, "changes": { "more": "mais" }, "undo": { "undoDisabled": "Desfazer indisponível" } @@ -270,8 +270,8 @@ "completed": { "number": "Número de fusões concluídas: " }, "continueDialog": { "title": "Continuar a mesclagem?", - "yes": "sim", - "no": "não" + "yes": "Sim", + "no": "Não" }, "undo": { "undo": "Desfazer Mesclar",