2019-12-30 19:03:16 +00:00
parent b6a54ed50a
commit ed91c8cff1
5 changed files with 100 additions and 72 deletions
--- a/server/AyaNova/biz/LocaleBiz.cs
+++ b/server/AyaNova/biz/LocaleBiz.cs
@@ -421,6 +421,30 @@ namespace AyaNova.Biz
            s = s.Replace("WorkorderItemMiscExpenseExpense", "WorkorderItemMiscExpense", StringComparison.InvariantCultureIgnoreCase);
            s = s.Replace("WorkorderItemTravelTravel", "WorkorderItemTravel", StringComparison.InvariantCultureIgnoreCase);

+            //ScheduleMarkers -> Reminder
+            s = s.Replace("ScheduleMarker", "Reminder", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerARGB", "ReminderARGB", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerColor", "ReminderColor", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerCompleted", "ReminderCompleted", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerEventCreated", "ReminderEventCreated", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerEventPendingAlert", "ReminderEventPendingAlert", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerFollowUp", "ReminderFollowUp", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerList", "ReminderList", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerName", "ReminderName", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerNotes", "ReminderNotes", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerRecurrence", "ReminderRecurrence", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerScheduleMarkerSourceType", "ReminderSourceType", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerSourceID", "ReminderSourceID", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerStartDate", "ReminderStartDate", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleMarkerStopDate", "ReminderStopDate", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleEditScheduleMarker", "ScheduleEditReminder", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("ScheduleNewScheduleMarker", "ScheduleNewReminder", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);
+            s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);
+

            //Custom fields were 0 to 9, now 1 to 16
            s = s.Replace("Custom9", "Custom10", StringComparison.InvariantCultureIgnoreCase);
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -479,7 +479,7 @@
  "ScheduleableUserGroup": "Planbare Benutzergruppe",
  "ScheduleableUserGroupUser": "Planbare Benutzergruppe - Benutzer",
  "ScheduleForm": "Zeitplanformular",
-  "ScheduleMarker": "Erinnerung",
+  "Reminder": "Erinnerung",
  "SecurityGroup": "Sicherheitsgruppe",
  "ServiceBank": "Serviceguthaben",
  "Task": "Aufgabe",
@@ -768,20 +768,20 @@
  "ScheduleableUserNameDisplayFormatsRegionFirstLast": "Region - First Last",
  "ScheduleableUserNameDisplayFormatsRegionLastFirst": "Region - Last, First",
  "ScheduledList": "Geplant",
-  "ScheduleMarkerARGB": "ARGB",
-  "ScheduleMarkerColor": "Farbe",
-  "ScheduleMarkerCompleted": "Completed",
-  "ScheduleMarkerEventCreated": "Zeitplanmarkierung - gerade erstellt",
-  "ScheduleMarkerEventPendingAlert": "Zeitplanmarkierung - Ereignis steht unmittelbar bevor",
-  "ScheduleMarkerFollowUp": "Follow up",
-  "ScheduleMarkerList": "Erinnerungen",
-  "ScheduleMarkerName": "Name",
-  "ScheduleMarkerNotes": "Anmerkungen",
-  "ScheduleMarkerRecurrence": "Wiederholung",
-  "ScheduleMarkerScheduleMarkerSourceType": "Für",
-  "ScheduleMarkerSourceID": "Quelle",
-  "ScheduleMarkerStartDate": "Start",
-  "ScheduleMarkerStopDate": "Ende",
+  "ReminderARGB": "ARGB",
+  "ReminderColor": "Farbe",
+  "ReminderCompleted": "Completed",
+  "ReminderEventCreated": "Zeitplanmarkierung - gerade erstellt",
+  "ReminderEventPendingAlert": "Zeitplanmarkierung - Ereignis steht unmittelbar bevor",
+  "ReminderFollowUp": "Follow up",
+  "ReminderList": "Erinnerungen",
+  "ReminderName": "Name",
+  "ReminderNotes": "Anmerkungen",
+  "ReminderRecurrence": "Wiederholung",
+  "ReminderSourceType": "Für",
+  "ReminderSourceID": "Quelle",
+  "ReminderStartDate": "Start",
+  "ReminderStopDate": "Ende",
  "SearchResultDescription": "Beschreibung",
  "SearchResultExtract": "Extrahieren",
  "SearchResultRank": "Rang",
@@ -1025,11 +1025,11 @@
  "ScheduleAddToActiveWorkorderItem": "Auswahl zum aktiven Arbeitsauftragsposten hinzufügen",
  "ScheduleDayView": "1-Tag-Ansicht",
  "ScheduleEditScheduleableUserGroup": "Planbare Benutzergruppen bearbeiten",
-  "ScheduleEditScheduleMarker": "Bearbeiten Sie die ausgewählte Erinnerung",
+  "ScheduleEditReminder": "Bearbeiten Sie die ausgewählte Erinnerung",
  "ScheduleEditWorkorder": "Ausgewählten Arbeitsauftrag bearbeiten",
  "ScheduleMergeUsers": "Zusammen/Separat anzeigen",
  "ScheduleMonthView": "Monatsansicht",
-  "ScheduleNewScheduleMarker": "Neue Erinnerung",
+  "ScheduleNewReminder": "Neue Erinnerung",
  "ScheduleNewWorkorder": "Neuer Servicearbeitsauftrag",
  "SchedulePrintWorkorders": "Print selected work orders",
  "ScheduleSelectScheduleableUserGroup": "Planbare Benutzer auswählen",
@@ -1595,5 +1595,6 @@
  "ServerJobs":"Auftragswarteschlange",
  "ServerLog":"Server-Protokoll",
  "ServerMetrics":"Server-Metriken",
-  "NotificationSettings": "Benachrichtigungseinstellungen"
+  "NotificationSettings": "Benachrichtigungseinstellungen",
+  "Review": "Überprüfung"
 }
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -479,7 +479,7 @@
  "ScheduleableUserGroup": "Scheduleable user group",
  "ScheduleableUserGroupUser": "Scheduleable User Group User",
  "ScheduleForm": "Schedule form",
-  "ScheduleMarker": "Reminder",
+  "Reminder": "Reminder",
  "SecurityGroup": "Security group",
  "ServiceBank": "Service bank",
  "Task": "Task",
@@ -768,20 +768,20 @@
  "ScheduleableUserNameDisplayFormatsRegionFirstLast": "Region - First Last",
  "ScheduleableUserNameDisplayFormatsRegionLastFirst": "Region - Last, First",
  "ScheduledList": "Scheduled List",
-  "ScheduleMarkerARGB": "ARGB",
-  "ScheduleMarkerColor": "Color",
-  "ScheduleMarkerCompleted": "Completed",
-  "ScheduleMarkerEventCreated": "Reminder - Just created",
-  "ScheduleMarkerEventPendingAlert": "Reminder -  Event imminent",
-  "ScheduleMarkerFollowUp": "Follow up",
-  "ScheduleMarkerList": "Reminders",
-  "ScheduleMarkerName": "Name",
-  "ScheduleMarkerNotes": "Notes",
-  "ScheduleMarkerRecurrence": "Recurrence",
-  "ScheduleMarkerScheduleMarkerSourceType": "For",
-  "ScheduleMarkerSourceID": "Source",
-  "ScheduleMarkerStartDate": "Start",
-  "ScheduleMarkerStopDate": "Stop",
+  "ReminderARGB": "ARGB",
+  "ReminderColor": "Color",
+  "ReminderCompleted": "Completed",
+  "ReminderEventCreated": "Reminder - Just created",
+  "ReminderEventPendingAlert": "Reminder -  Event imminent",
+  "ReminderFollowUp": "Follow up",
+  "ReminderList": "Reminders",
+  "ReminderName": "Name",
+  "ReminderNotes": "Notes",
+  "ReminderRecurrence": "Recurrence",
+  "ReminderSourceType": "For",
+  "ReminderSourceID": "Source",
+  "ReminderStartDate": "Start",
+  "ReminderStopDate": "Stop",
  "SearchResultDescription": "Description",
  "SearchResultExtract": "Extract",
  "SearchResultRank": "Rank",
@@ -1025,11 +1025,11 @@
  "ScheduleAddToActiveWorkorderItem": "Add selection to active workorder item",
  "ScheduleDayView": "Single Day View",
  "ScheduleEditScheduleableUserGroup": "Edit Scheduleable User Groups",
-  "ScheduleEditScheduleMarker": "Edit selected reminder",
+  "ScheduleEditReminder": "Edit selected reminder",
  "ScheduleEditWorkorder": "Edit selected Workorder",
  "ScheduleMergeUsers": "Display Merged / Separate",
  "ScheduleMonthView": "Month View",
-  "ScheduleNewScheduleMarker": "New reminder",
+  "ScheduleNewReminder": "New reminder",
  "ScheduleNewWorkorder": "New Service Workorder",
  "SchedulePrintWorkorders": "Print selected work orders",
  "ScheduleSelectScheduleableUserGroup": "Select Scheduleable Users",
@@ -1594,7 +1594,8 @@
  "ServerJobs":"Job queue",
  "ServerLog":"Server log",
  "ServerMetrics":"Server metrics",
-  "NotificationSettings": "Notification settings"
+  "NotificationSettings": "Notification settings",
+  "Review": "Review"


  
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -478,7 +478,7 @@
  "ScheduleableUserGroup": "Grupo de usuarios programables",
  "ScheduleableUserGroupUser": "Usuario de grupo de usuarios programables",
  "ScheduleForm": "Formulario programación",
-  "ScheduleMarker": "Recordatorio",
+  "Reminder": "Recordatorio",
  "SecurityGroup": "Grupo de seguridad",
  "ServiceBank": "Pagos por adelantado",
  "Task": "Tarea",
@@ -767,20 +767,20 @@
  "ScheduleableUserNameDisplayFormatsRegionFirstLast": "Region - First Last",
  "ScheduleableUserNameDisplayFormatsRegionLastFirst": "Region - Last, First",
  "ScheduledList": "Lista programada",
-  "ScheduleMarkerARGB": "ARGB",
-  "ScheduleMarkerColor": "Color",
-  "ScheduleMarkerCompleted": "Completed",
-  "ScheduleMarkerEventCreated": "Marca de programación - Recién creada",
-  "ScheduleMarkerEventPendingAlert": "Marca de programación - Evento inminente",
-  "ScheduleMarkerFollowUp": "Follow up",
-  "ScheduleMarkerList": "Recordatorios",
-  "ScheduleMarkerName": "Nombre",
-  "ScheduleMarkerNotes": "Notas",
-  "ScheduleMarkerRecurrence": "Recurrencia",
-  "ScheduleMarkerScheduleMarkerSourceType": "Para",
-  "ScheduleMarkerSourceID": "Origen",
-  "ScheduleMarkerStartDate": "Inicio",
-  "ScheduleMarkerStopDate": "Fin",
+  "ReminderARGB": "ARGB",
+  "ReminderColor": "Color",
+  "ReminderCompleted": "Completed",
+  "ReminderEventCreated": "Marca de programación - Recién creada",
+  "ReminderEventPendingAlert": "Marca de programación - Evento inminente",
+  "ReminderFollowUp": "Follow up",
+  "ReminderList": "Recordatorios",
+  "ReminderName": "Nombre",
+  "ReminderNotes": "Notas",
+  "ReminderRecurrence": "Recurrencia",
+  "ReminderSourceType": "Para",
+  "ReminderSourceID": "Origen",
+  "ReminderStartDate": "Inicio",
+  "ReminderStopDate": "Fin",
  "SearchResultDescription": "Descripción",
  "SearchResultExtract": "Extracto",
  "SearchResultRank": "Rango",
@@ -1025,11 +1025,11 @@
  "ScheduleAddToActiveWorkorderItem": "Añadir selección al elemento de pedido activo",
  "ScheduleDayView": "Sólo un día",
  "ScheduleEditScheduleableUserGroup": "Editar grupos de usuarios programables",
-  "ScheduleEditScheduleMarker": "Editar recordatorio seleccionado",
+  "ScheduleEditReminder": "Editar recordatorio seleccionado",
  "ScheduleEditWorkorder": "Editar pedido seleccionado",
  "ScheduleMergeUsers": "Mostrar junto / separado",
  "ScheduleMonthView": "Mes",
-  "ScheduleNewScheduleMarker": "Nuevo recordatorio",
+  "ScheduleNewReminder": "Nuevo recordatorio",
  "ScheduleNewWorkorder": "Nuevo pedido de servicio",
  "SchedulePrintWorkorders": "Print selected work orders",
  "ScheduleSelectScheduleableUserGroup": "Seleccionar usuarios programables",
@@ -1595,7 +1595,8 @@
  "ServerJobs":"Cola de trabajo",
  "ServerLog":"Registro del servidor",
  "ServerMetrics":"Métricas del servidor",
-  "NotificationSettings": "Configuración de notificaciones"
+  "NotificationSettings": "Configuración de notificaciones",
+  "Review": "Revisión"


 }
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -479,7 +479,7 @@
  "ScheduleableUserGroup": "Groupes d'utilisateurs programmables",
  "ScheduleableUserGroupUser": "Utilisateur de groupe d'utilisateurs programmables",
  "ScheduleForm": "Formulaire de programme",
-  "ScheduleMarker": "Rappel",
+  "Reminder": "Rappel",
  "SecurityGroup": "Groupe de sécurité",
  "ServiceBank": "Services prépayés",
  "Task": "Tâche",
@@ -768,20 +768,20 @@
  "ScheduleableUserNameDisplayFormatsRegionFirstLast": "Region - First Last",
  "ScheduleableUserNameDisplayFormatsRegionLastFirst": "Region - Last, First",
  "ScheduledList": "Liste programmée",
-  "ScheduleMarkerARGB": "ARVB",
-  "ScheduleMarkerColor": "Couleur",
-  "ScheduleMarkerCompleted": "Completed",
-  "ScheduleMarkerEventCreated": "Rappel - Récemment créé",
-  "ScheduleMarkerEventPendingAlert": "Rappel - Événement imminent",
-  "ScheduleMarkerFollowUp": "Follow up",
-  "ScheduleMarkerList": "Rappels",
-  "ScheduleMarkerName": "Nom",
-  "ScheduleMarkerNotes": "Notes",
-  "ScheduleMarkerRecurrence": "Répétition",
-  "ScheduleMarkerScheduleMarkerSourceType": "Pour",
-  "ScheduleMarkerSourceID": "Source",
-  "ScheduleMarkerStartDate": "Début",
-  "ScheduleMarkerStopDate": "Fin",
+  "ReminderARGB": "ARVB",
+  "ReminderColor": "Couleur",
+  "ReminderCompleted": "Completed",
+  "ReminderEventCreated": "Rappel - Récemment créé",
+  "ReminderEventPendingAlert": "Rappel - Événement imminent",
+  "ReminderFollowUp": "Follow up",
+  "ReminderList": "Rappels",
+  "ReminderName": "Nom",
+  "ReminderNotes": "Notes",
+  "ReminderRecurrence": "Répétition",
+  "ReminderSourceType": "Pour",
+  "ReminderSourceID": "Source",
+  "ReminderStartDate": "Début",
+  "ReminderStopDate": "Fin",
  "SearchResultDescription": "Description",
  "SearchResultExtract": "Extrait",
  "SearchResultRank": "Rang",
@@ -1025,11 +1025,11 @@
  "ScheduleAddToActiveWorkorderItem": "Ajouter la sélection à l'élément de bon de travail actif",
  "ScheduleDayView": "Affichage Journée unique",
  "ScheduleEditScheduleableUserGroup": "Modifier les groupes d'utilisateurs programmables",
-  "ScheduleEditScheduleMarker": "Modifier le rappel",
+  "ScheduleEditReminder": "Modifier le rappel",
  "ScheduleEditWorkorder": "Modifier le bon de travail sélectionné",
  "ScheduleMergeUsers": "Affichage fusionné / séparé",
  "ScheduleMonthView": "Affichage Mois",
-  "ScheduleNewScheduleMarker": "Nouveau rappel",
+  "ScheduleNewReminder": "Nouveau rappel",
  "ScheduleNewWorkorder": "Nouveau bon de travail de service",
  "SchedulePrintWorkorders": "Print selected work orders",
  "ScheduleSelectScheduleableUserGroup": "Sélectionner utilisateurs programmables",
@@ -1594,7 +1594,8 @@
  "ServerJobs":"File d'attente des travaux",
  "ServerLog":"Journaux du serveur",
  "ServerMetrics":"Mesure du serveur",
-  "NotificationSettings": "Paramètres de notification"
+  "NotificationSettings": "Paramètres de notification",
+  "Review": "Évaluation"


 }