From 595222a99606efc6b1a112d30211ed6246e19f41 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 17 Jan 2019 18:36:17 +0000 Subject: [PATCH] --- devdocs/todo.txt | 8 -------- server/AyaNova/biz/LocaleBiz.cs | 3 +++ server/AyaNova/resource/de.json | 35 ++++++++++++++++----------------- server/AyaNova/resource/en.json | 35 ++++++++++++++++----------------- server/AyaNova/resource/es.json | 35 ++++++++++++++++----------------- server/AyaNova/resource/fr.json | 35 ++++++++++++++++----------------- 6 files changed, 71 insertions(+), 80 deletions(-) diff --git a/devdocs/todo.txt b/devdocs/todo.txt index c4476db6..704d0c5e 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -16,14 +16,6 @@ SERVER - DO ALL THE THINGS!!!! - all the way down to DOCS MANUAL below which isn't urgent and go back to client stuff - - - Resource localization edit all Custom field locale keys for all langauges and change to be 1 to 16 (remove 0 and add 6 more) - - So, for example ClientCustom0 becomes ClientCustom1 and make sure the display values are identical as right now there are "My Custom0" and "Custom Field 8" in the same bunch - - Copy from WidgetCustom1 to 16 if necessary or for reference - - Fixup the imported local customs too - - - Importv7Locale: add code to fixup the imported locale with any keys it's missing from the stock english resource key set on import - - Resource localization edit wherever possible to change "Common*" such as "CommonActive" to remove the "common" part wherever possible. - Also check if used anywhere in client or at server and rename there too diff --git a/server/AyaNova/biz/LocaleBiz.cs b/server/AyaNova/biz/LocaleBiz.cs index 7f98ebc9..a6bc5c0b 100644 --- a/server/AyaNova/biz/LocaleBiz.cs +++ b/server/AyaNova/biz/LocaleBiz.cs @@ -436,6 +436,9 @@ namespace AyaNova.Biz s = s.Replace("Custom0", "Custom1", StringComparison.InvariantCultureIgnoreCase); //separate code will handle adding the new keys that didn't exist in v7 (custom 11 - 16) + //CommonActive CommonID etc remove Common + s = s.Replace("Common", ""); + return s; } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index fdeedf54..a04f00be 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -110,23 +110,23 @@ "ClientServiceRequestStatusClosed": "Closed", "ClientServiceRequestStatusDeclined": "Declined", "ClientServiceRequestStatusOpen": "Open", - "CommonActive": "Aktiv", - "CommonContractExpires": "Vertrag läuft ab", - "CommonCost": "Kosten", - "CommonCreated": "Datensatz erstellt", - "CommonCreator": "Datensatz erstellt von", - "CommonDefaultLanguage": "Standardsprache", - "CommonDescription": "Beschreibung", - "CommonID": "Eindeutige Kennzeichnungsnummer", - "CommonModified": "Datensatz zuletzt geändert am", - "CommonModifier": "Datensatz zuletzt geändert von", - "CommonMore": "More...", - "CommonName": "Name", - "CommonRootObject": "Stammobjekt", - "CommonRootObjectType": "Stammobjekttyp", - "CommonSerialNumber": "Seriennummer", - "CommonUsesBanking": "Service gutschreiben", - "CommonWebAddress": "Webadresse", + "Active": "Aktiv", + "ContractExpires": "Vertrag läuft ab", + "Cost": "Kosten", + "Created": "Datensatz erstellt", + "Creator": "Datensatz erstellt von", + "DefaultLanguage": "Standardsprache", + "Description": "Beschreibung", + "ID": "Eindeutige Kennzeichnungsnummer", + "Modified": "Datensatz zuletzt geändert am", + "Modifier": "Datensatz zuletzt geändert von", + "More": "More...", + "Name": "Name", + "RootObject": "Stammobjekt", + "RootObjectType": "Stammobjekttyp", + "SerialNumber": "Seriennummer", + "UsesBanking": "Service gutschreiben", + "WebAddress": "Webadresse", "ContactContactTitleID": "Titel", "ContactDescription": "Beschreibung", "ContactEmailAddress": "E-Mail-Adresse", @@ -1530,7 +1530,6 @@ "WidgetCustom16": "Angepasstes Feld 16", "RowsPerPage":"Zeilen pro Seite", "Tags":"Kategorien", - "ID":"ID", "UserTypesSubContractor": "Subunternehmer", "AuthorizationRoleNoRole":"Keine Rolle", "AuthorizationRoleBizAdminLimited":"Geschäftsverwaltung - beschränkt", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 71f7bf27..4b48ca57 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -110,23 +110,23 @@ "ClientServiceRequestStatusClosed": "Closed", "ClientServiceRequestStatusDeclined": "Declined", "ClientServiceRequestStatusOpen": "Open", - "CommonActive": "Active", - "CommonContractExpires": "Contract expires", - "CommonCost": "Cost", - "CommonCreated": "Record Created", - "CommonCreator": "Record Created By", - "CommonDefaultLanguage": "Default language", - "CommonDescription": "Description", - "CommonID": "Unique identification number", - "CommonModified": "Record Last Modified", - "CommonModifier": "Record Last Modified by", - "CommonMore": "More...", - "CommonName": "Name", - "CommonRootObject": "Root object", - "CommonRootObjectType": "Root object type", - "CommonSerialNumber": "Serial Number", - "CommonUsesBanking": "Bank service", - "CommonWebAddress": "Web Address", + "Active": "Active", + "ContractExpires": "Contract expires", + "Cost": "Cost", + "Created": "Record Created", + "Creator": "Record Created By", + "DefaultLanguage": "Default language", + "Description": "Description", + "ID": "Unique identification number", + "Modified": "Record Last Modified", + "Modifier": "Record Last Modified by", + "More": "More...", + "Name": "Name", + "RootObject": "Root object", + "RootObjectType": "Root object type", + "SerialNumber": "Serial Number", + "UsesBanking": "Bank service", + "WebAddress": "Web Address", "ContactContactTitleID": "Title", "ContactDescription": "Description", "ContactEmailAddress": "Email Address", @@ -1529,7 +1529,6 @@ "WidgetCustom16": "Custom16", "RowsPerPage":"Rows per page", "Tags":"Tags", - "ID":"ID", "UserTypesSubContractor": "SubContractor user", "AuthorizationRoleNoRole":"No role", "AuthorizationRoleBizAdminLimited":"Business administration - limited", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 937d0180..5409a69e 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -110,23 +110,23 @@ "ClientServiceRequestStatusClosed": "Closed", "ClientServiceRequestStatusDeclined": "Declined", "ClientServiceRequestStatusOpen": "Open", - "CommonActive": "Activo", - "CommonContractExpires": "El contrato expira", - "CommonCost": "Coste", - "CommonCreated": "Registro creado", - "CommonCreator": "Registro creado por", - "CommonDefaultLanguage": "Idioma por omisión", - "CommonDescription": "Descripción", - "CommonID": "Número de identificación único", - "CommonModified": "Registro modificado", - "CommonModifier": "Registro modificado por", - "CommonMore": "More...", - "CommonName": "Nombre", - "CommonRootObject": "Objeto raíz", - "CommonRootObjectType": "Tipo de objeto raíz", - "CommonSerialNumber": "Número de serie", - "CommonUsesBanking": "Pago por adelantado", - "CommonWebAddress": "Dirección web", + "Active": "Activo", + "ContractExpires": "El contrato expira", + "Cost": "Coste", + "Created": "Registro creado", + "Creator": "Registro creado por", + "DefaultLanguage": "Idioma por omisión", + "Description": "Descripción", + "ID": "Número de identificación único", + "Modified": "Registro modificado", + "Modifier": "Registro modificado por", + "More": "More...", + "Name": "Nombre", + "RootObject": "Objeto raíz", + "RootObjectType": "Tipo de objeto raíz", + "SerialNumber": "Número de serie", + "UsesBanking": "Pago por adelantado", + "WebAddress": "Dirección web", "ContactContactTitleID": "Tratamiento", "ContactDescription": "Descripción", "ContactEmailAddress": "Dirección de e-mail", @@ -1530,7 +1530,6 @@ "WidgetCustom16": "Campo personalizado 16", "RowsPerPage":"Filas por página", "Tags":"Etiquetas", - "ID":"ID", "UserTypesSubContractor": "Subcontratista", "AuthorizationRoleNoRole":"Sin rol", "AuthorizationRoleBizAdminLimited":"Administracion de empresas - limitada", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 376fae7b..096a9585 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -110,23 +110,23 @@ "ClientServiceRequestStatusClosed": "Closed", "ClientServiceRequestStatusDeclined": "Declined", "ClientServiceRequestStatusOpen": "Open", - "CommonActive": "Actif", - "CommonContractExpires": "Expiration du contrat", - "CommonCost": "Coût", - "CommonCreated": "Enregistrement créé", - "CommonCreator": "Enregistrement créé par", - "CommonDefaultLanguage": "Langue par défaut", - "CommonDescription": "Description", - "CommonID": "Numéro d'identification unique", - "CommonModified": "Enregistrement dernièrement modifié", - "CommonModifier": "Enregistrement dernièrement modifié par", - "CommonMore": "More...", - "CommonName": "Nom", - "CommonRootObject": "Objet racine", - "CommonRootObjectType": "Type d'objet racine", - "CommonSerialNumber": "Numéro de série", - "CommonUsesBanking": "Prépaiements", - "CommonWebAddress": "Adresse Web", + "Active": "Actif", + "ContractExpires": "Expiration du contrat", + "Cost": "Coût", + "Created": "Enregistrement créé", + "Creator": "Enregistrement créé par", + "DefaultLanguage": "Langue par défaut", + "Description": "Description", + "ID": "Numéro d'identification unique", + "Modified": "Enregistrement dernièrement modifié", + "Modifier": "Enregistrement dernièrement modifié par", + "More": "More...", + "Name": "Nom", + "RootObject": "Objet racine", + "RootObjectType": "Type d'objet racine", + "SerialNumber": "Numéro de série", + "UsesBanking": "Prépaiements", + "WebAddress": "Adresse Web", "ContactContactTitleID": "Titre", "ContactDescription": "Description", "ContactEmailAddress": "Adresse e-mail", @@ -1529,7 +1529,6 @@ "WidgetCustom16": "Champ personnalisé 16", "RowsPerPage":"Lignes par page", "Tags":"Balises", - "ID":"ID", "UserTypesSubContractor": "Sous-traitant", "AuthorizationRoleNoRole":"Pas de rôle", "AuthorizationRoleBizAdminLimited":"Administration des affaires - limitée",