Skip to content

Commit c11567c

Browse files
authored
Merge branch 'develop' into feature/FWF-4595-form-component-ui-updates
2 parents df90008 + ec2ca61 commit c11567c

File tree

9 files changed

+140
-24
lines changed

9 files changed

+140
-24
lines changed

forms-flow-components/src/components/CustomComponents/Button.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ButtonGroup from "react-bootstrap/ButtonGroup";
44
import Dropdown from "react-bootstrap/Dropdown";
55
import { ChevronIcon, LoadingIcon } from "../SvgIcons/index";
66
import { useTranslation } from "react-i18next";
7-
7+
import i18n from "../../resourceBundles/i18n";
88
interface DropdownItem {
99
label: string;
1010
onClick: () => void;
@@ -96,6 +96,10 @@ export const CustomButton: React.FC<CustomButtonProps> = ({
9696
useEffect(() => {
9797
updateMenuStyle();
9898
window.addEventListener("resize", updateMenuStyle);
99+
const locale = localStorage.getItem("i18nextLng");
100+
if (locale) {
101+
i18n.changeLanguage(locale);
102+
}
99103
return () => window.removeEventListener("resize", updateMenuStyle);
100104
}, []);
101105

forms-flow-nav/src/sidenav/Sidebar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
391391
baseUrl={baseUrl}
392392
eventKey={SectionKeys.DESIGN.value}
393393
optionsCount="5"
394-
mainMenu="Design"
394+
mainMenu={t("Design")}
395395
subMenu={[
396396
{
397397
name: "Forms & Flows",

forms-flow-service/src/resourceBundles/bg/resourceBundles.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export const RESOURCE_BUNDLES_BG = {
222222
"History": "История",
223223
"Diagram": "Диаграма",
224224
"Delete Confirmation": "Изтриване на потвърждение",
225-
"All tasks": "Всички задачи",
225+
"All Tasks": "Всички задачи",
226226
"Manage Groups": "Управление на групи",
227227
"Group ID": "ID на групата",
228228
"Due": "В следствие",
@@ -1300,7 +1300,7 @@ export const RESOURCE_BUNDLES_BG = {
13001300
"Create And Edit BPMN": "Създаване и редактиране на BPMN",
13011301
"Create And Edit DMN": "Създаване и редактиране на DMN",
13021302
"Import New Form": "Импортиране на нова форма",
1303-
"Confirm and Edit form": "Потвърдете и редактирайте формата",
1303+
"Confirm and Edit Form": "Потвърдете и редактирайте формата",
13041304
"Click or drag a file to this area to import": "Щракнете или плъзнете файл в тази област, за да го импортирате",
13051305
"Import New": "Импортиране на ново",
13061306
"Search DMN Name": "Търсене на име DMN",
@@ -1574,5 +1574,21 @@ export const RESOURCE_BUNDLES_BG = {
15741574
"Custom Form Fields": "Персонализирани формуляри",
15751575
"Saved!": "Запазено!",
15761576
"Deleted!": "Изтрито!",
1577-
"Updated!": "Актуализирано!"
1577+
"Updated!": "Актуализирано!",
1578+
"Set as default filter": "Задай като филтър по подразбиране",
1579+
"New Form & Flow": "Нова форма и поток",
1580+
"Last Modified On": "Последно променено на",
1581+
"New Submission": "Ново изпращане",
1582+
"Design": "Дизайн",
1583+
"Review": "Преглед",
1584+
"Analyze": "Анализирай",
1585+
"Manage": "Управление",
1586+
"Search By ID": "Търсене по ID",
1587+
"Link": "Връзка",
1588+
"Save as template": "Запазване като шаблон",
1589+
"Select category for the template": "Изберете категория за шаблона",
1590+
"Template Name": "Име на шаблон",
1591+
"Template Description": "Описание на шаблона",
1592+
"All Fields": "Всички полета",
1593+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "Не са намерени формуляри. Създайте нов формуляр, като щракнете върху бутона „Нова форма и поток“ в горния десен ъгъл."
15781594
}

forms-flow-service/src/resourceBundles/de/resourceBundles.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ export const RESOURCE_BUNDLES_DE = {
226226
"History": "Historie",
227227
"Diagram": "Diagramm",
228228
"Delete Confirmation": "Bestätigung löschen",
229-
"All tasks": "Alle Aufgaben",
229+
"All Tasks": "Alle Aufgaben",
230230
"Manage Groups": "Gruppen verwalten",
231231
"Group ID": "Gruppen-ID",
232232
"Due": "Fällig",
@@ -1296,7 +1296,7 @@ export const RESOURCE_BUNDLES_DE = {
12961296
"New BPMN": "Neues BPMN",
12971297
"Create the BPMN from scratch": "Erstellen Sie das BPMN von Grund auf",
12981298
"Import New Form": "Neues Formular importieren",
1299-
"Confirm and Edit form": "Formular bestätigen und bearbeiten",
1299+
"Confirm and Edit Form": "Formular bestätigen und bearbeiten",
13001300
"Click or drag a file to this area to import": "Klicken oder ziehen Sie eine Datei in diesen Bereich, um sie zu importieren",
13011301
"Upload BPMN from a file": "BPMN aus einer Datei hochladen",
13021302
"Search BPMN Name": "BPMN-Namen suchen",
@@ -1579,5 +1579,21 @@ export const RESOURCE_BUNDLES_DE = {
15791579
"Custom Form Fields": "Benutzerdefinierte Formularfelder",
15801580
"Saved!": "Gespeichert!",
15811581
"Deleted!": "Gelöscht!",
1582-
"Updated!": "Aktualisiert!"
1582+
"Updated!": "Aktualisiert!",
1583+
"Set as default filter": "Als Standardfilter festlegen",
1584+
"New Form & Flow": "Neues Formular & Ablauf",
1585+
"Last Modified On": "Zuletzt geändert am",
1586+
"New Submission": "Neue Einreichung",
1587+
"Design": "Design",
1588+
"Review": "Überprüfen",
1589+
"Analyze": "Analysieren",
1590+
"Manage": "Verwalten",
1591+
"Search By ID": "Nach ID suchen",
1592+
"Link": "Link",
1593+
"Save as template": "Als Vorlage speichern",
1594+
"Select category for the template": "Kategorie für die Vorlage auswählen",
1595+
"Template Name": "Vorlagenname",
1596+
"Template Description": "Vorlagenbeschreibung",
1597+
"All Fields": "Alle Felder",
1598+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "Es wurden keine Formulare gefunden. Erstellen Sie ein neues Formular, indem Sie oben rechts auf die Schaltfläche „Neues Formular & Ablauf“ klicken."
15831599
}

forms-flow-service/src/resourceBundles/en/resourceBundles.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export const RESOURCE_BUNDLES_EN = {
224224
"History": "History",
225225
"Diagram": "Diagram",
226226
"Delete Confirmation": "Delete Confirmation",
227-
"All tasks": "All tasks",
227+
"All Tasks": "All Tasks",
228228
"Manage Groups": "Manage Groups",
229229
"Group ID": "Group ID",
230230
"Due": "Due",
@@ -820,7 +820,7 @@ export const RESOURCE_BUNDLES_EN = {
820820
"New BPMN": "New BPMN",
821821
"Create the BPMN from scratch": "Create the BPMN from scratch",
822822
"Import New Form": "Import New Form",
823-
"Confirm and Edit form": "Confirm and Edit form",
823+
"Confirm and Edit Form": "Confirm and Edit Form",
824824
"Click or drag a file to this area to import": "Click or drag a file to this area to import",
825825
"Upload BPMN from a file": "Upload BPMN from a file",
826826
"Search BPMN Name": "Search BPMN Name",
@@ -1071,5 +1071,21 @@ export const RESOURCE_BUNDLES_EN = {
10711071
"Custom Form Fields": "Custom Form Fields",
10721072
"Saved!": "Saved!",
10731073
"Deleted!": "Deleted!",
1074-
"Updated!": "Updated!"
1074+
"Updated!": "Updated!",
1075+
"Set as default filter": "Set as default filter",
1076+
"New Form & Flow": "New Form & Flow",
1077+
"Last Modified On": "Last Modified On",
1078+
"New Submission": "New Submission",
1079+
"Design": "Design",
1080+
"Review": "Review",
1081+
"Analyze": "Analyze",
1082+
"Manage": "Manage",
1083+
"Search By ID": "Search By ID",
1084+
"Link": "Link",
1085+
"Save as template": "Save as template",
1086+
"Select category for the template": "Select category for the template",
1087+
"Template Name": "Template Name",
1088+
"Template Description": "Template Description",
1089+
"All Fields": "All Fields",
1090+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right."
10751091
}

forms-flow-service/src/resourceBundles/es/resourceBundles.ts

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//Spanish
1+
//
22
export const RESOURCE_BUNDLES_ES = {
33
"Dismiss": "Descartar",
44
"You Cannot Delete This Form & Flow": "No puedes eliminar este formulario y flujo.",
@@ -155,7 +155,7 @@ export const RESOURCE_BUNDLES_ES = {
155155
"History": "Historial",
156156
"Diagram": "Diagrama",
157157
"Delete Confirmation": "Confirmación de eliminación",
158-
"All tasks": "Todas las tareas",
158+
"All Tasks": "Todas las tareas",
159159
"Manage Groups": "Administrar grupos",
160160
"Group ID": "ID de grupo",
161161
"Due": "Fecha límite",
@@ -788,7 +788,7 @@ export const RESOURCE_BUNDLES_ES = {
788788
"Create And Edit BPMN": "Crear y Editar BPMN",
789789
"Create And Edit DMN": "Crear y Editar DMN",
790790
"Import New Form": "Importar nuevo formulario",
791-
"Confirm and Edit form": "Confirmar y editar formulario",
791+
"Confirm and Edit Form": "Confirmar y editar formulario",
792792
"Click or drag a file to this area to import": "Haga clic o arrastre un archivo a esta área para importarlo",
793793
"Import New": "Importar Nuevo",
794794
"Search DMN Name": "Buscar nombre DMN",
@@ -1071,5 +1071,21 @@ export const RESOURCE_BUNDLES_ES = {
10711071
"Custom Form Fields": "Campos de formulario personalizados",
10721072
"Saved!": "¡Guardado!",
10731073
"Deleted!": "¡Eliminado!",
1074-
"Updated!": "¡Actualizado!"
1074+
"Updated!": "¡Actualizado!",
1075+
"Set as default filter": "Establecer como filtro predeterminado",
1076+
"New Form & Flow": "Nuevo formulario y flujo",
1077+
"Last Modified On": "Última modificación el",
1078+
"New Submission": "Nueva presentación",
1079+
"Design": "Diseño",
1080+
"Review": "Revisar",
1081+
"Analyze": "Analizar",
1082+
"Manage": "Gestionar",
1083+
"Search By ID": "Buscar por ID",
1084+
"Link": "Enlace",
1085+
"Save as template": "Guardar como Plantilla",
1086+
"Select category for the template": "Seleccionar categoría para la plantilla",
1087+
"Template Name": "Nombre de la plantilla",
1088+
"Template Description": "Descripción de la plantilla",
1089+
"All Fields": "Todos los campos",
1090+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "No se han encontrado formularios. Cree uno nuevo haciendo clic en el botón \"Nuevo formulario y flujo\" en la parte superior derecha."
10751091
}

forms-flow-service/src/resourceBundles/fr/resourceBundles.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ export const RESOURCE_BUNDLES_FR ={
226226
"History": "Histoire",
227227
"Diagram": "Diagramme",
228228
"Delete Confirmation": "Confirmation de suppression",
229-
"All tasks": "Toutes les tâches",
229+
"All Tasks": "Toutes les tâches",
230230
"Manage Groups": "Gérer les groupes",
231231
"Group ID": "Identifiant du groupe",
232232
"Due": "Dû",
@@ -1300,7 +1300,7 @@ export const RESOURCE_BUNDLES_FR ={
13001300
"Create the DMN from scratch": "Créer le DMN à partir de zéro",
13011301
"Upload DMN from a file": "Télécharger le DMN depuis un fichier",
13021302
"Import New Form": "Importer un nouveau formulaire",
1303-
"Confirm and Edit form": "Confirmer et modifier le formulaire",
1303+
"Confirm and Edit Form": "Confirmer et modifier le formulaire",
13041304
"Click or drag a file to this area to import": "Cliquez ou glissez un fichier dans cette zone pour l'importer",
13051305
"Create And Edit BPMN": "Créer et modifier le BPMN",
13061306
"Create And Edit DMN": "Créer et modifier le DMN",
@@ -1574,7 +1574,23 @@ export const RESOURCE_BUNDLES_FR ={
15741574
"Custom Form Fields": "Champs de formulaire personnalisés",
15751575
"Saved!": "Enregistré !",
15761576
"Deleted!": "Supprimé !",
1577-
"Updated!": "Mis à jour !"
1577+
"Updated!": "Mis à jour !",
1578+
"Set as default filter": "Définir comme filtre par défaut",
1579+
"New Form & Flow": "Nouveau formulaire et flux",
1580+
"Last Modified On": "Dernière modification le",
1581+
"New Submission": "Nouvelle soumission",
1582+
"Design": "Conception",
1583+
"Review": "Revoir",
1584+
"Analyze": "Analyser",
1585+
"Manage": "Gérer",
1586+
"Search By ID": "Rechercher par ID",
1587+
"Link": "Lien",
1588+
"Save as template": "Enregistrer en tant que modèle",
1589+
"Select category for the template": "Sélectionner une catégorie pour le modèle",
1590+
"Template Name": "Nom du modèle",
1591+
"Template Description": "Description du modèle",
1592+
"All Fields": "Tous les champs",
1593+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "Aucun formulaire trouvé. Créez un nouveau formulaire en cliquant sur le bouton « Nouveau formulaire et flux » en haut à droite."
15781594
}
15791595

15801596

forms-flow-service/src/resourceBundles/pt/resourceBundles.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export const RESOURCE_BUNDLES_PT ={
220220
"History": "História",
221221
"Diagram": "Diagrama",
222222
"Delete Confirmation": "Confirmação de exclusão",
223-
"All tasks": "Todas as tarefas",
223+
"All Tasks": "Todas as tarefas",
224224
"Manage Groups": "Gerenciar grupos",
225225
"Group ID": "ID do grupo",
226226
"Due": "Devida",
@@ -1297,7 +1297,7 @@ export const RESOURCE_BUNDLES_PT ={
12971297
"Search BPMN Name": "Pesquisar Nome BPMN",
12981298
"New DMN": "Novo DMN",
12991299
"Import New Form": "Importar Novo Formulário",
1300-
"Confirm and Edit form": "Confirmar e Editar formulário",
1300+
"Confirm and Edit Form": "Confirmar e Editar formulário",
13011301
"Click or drag a file to this area to import": "Clique ou arraste um arquivo para esta área para importar",
13021302
"Search Decision Table": "Pesquisar Tabela de Decisão",
13031303
"Create the DMN from scratch": "Criar o DMN do zero",
@@ -1576,5 +1576,21 @@ export const RESOURCE_BUNDLES_PT ={
15761576
"Custom Form Fields": "Campos de formulário personalizados",
15771577
"Saved!": "Salvo!",
15781578
"Deleted!": "Excluído!",
1579-
"Updated!": "Atualizado!"
1579+
"Updated!": "Atualizado!",
1580+
"Set as default filter": "Definir como filtro padrão",
1581+
"New Form & Flow": "Novo formulário e fluxo",
1582+
"Last Modified On": "Última modificação em",
1583+
"New Submission": "Nova submissão",
1584+
"Design": "Design",
1585+
"Review": "Revisar",
1586+
"Analyze": "Analisar",
1587+
"Manage": "Gerenciar",
1588+
"Search By ID": "Pesquisar por ID",
1589+
"Link": "Link",
1590+
"Save as template": "Salvar como modelo",
1591+
"Select category for the template": "Selecionar categoria para o modelo",
1592+
"Template Name": "Nome do modelo",
1593+
"Template Description": "Descrição do modelo",
1594+
"All Fields": "Todos os campos",
1595+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "Nenhum formulário encontrado. Crie um novo formulário clicando no botão \"Novo formulário e fluxo\" no canto superior direito."
15801596
};

forms-flow-service/src/resourceBundles/zh/resourceBundles.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export const RESOURCE_BUNDLES_ZH = {
221221
"History": "历史",
222222
"Diagram": "图表",
223223
"Delete Confirmation": "删除确认",
224-
"All tasks": "所有任务",
224+
"All Tasks": "所有任务",
225225
"Manage Groups": "管理群组",
226226
"Group ID": "组ID",
227227
"Due": "到期的",
@@ -1287,7 +1287,7 @@ export const RESOURCE_BUNDLES_ZH = {
12871287
"Create the DMN from scratch": "从头创建 DMN",
12881288
"Upload DMN from a file": "从文件上传 DMN",
12891289
"Import New Form": "导入新表单",
1290-
"Confirm and Edit form": "确认并编辑表单",
1290+
"Confirm and Edit Form": "确认并编辑表单",
12911291
"Click or drag a file to this area to import": "单击或拖动文件到此区域进行导入",
12921292
"Create And Edit BPMN": "创建和编辑 BPMN",
12931293
"Create And Edit DMN": "创建和编辑 DMN",
@@ -1566,5 +1566,21 @@ export const RESOURCE_BUNDLES_ZH = {
15661566
"Custom Form Fields": "自定义表单字段",
15671567
"Saved!": "已保存!",
15681568
"Deleted!": "已删除!",
1569-
"Updated!": "已更新!"
1569+
"Updated!": "已更新!",
1570+
"Set as default filter": "设为默认筛选器",
1571+
"New Form & Flow": "新表单和流程",
1572+
"Last Modified On": "最后修改于",
1573+
"New Submission": "新提交",
1574+
"Design": "设计",
1575+
"Review": "审核",
1576+
"Analyze": "分析",
1577+
"Manage": "管理",
1578+
"Search By ID": "按ID搜索",
1579+
"Link": "链接",
1580+
"Save as template": "另存为模板",
1581+
"Select category for the template": "为模板选择类别",
1582+
"Template Name": "模板名称",
1583+
"Template Description": "模板描述",
1584+
"All Fields": "所有字段",
1585+
"No forms have been found. Create a new form by clicking the \"New Form & Flow\" button in the top right.": "未找到表单。请点击右上角的“新表单和流程”按钮创建新表单。"
15701586
}

0 commit comments

Comments
 (0)