webapp: Fix locale setup and database setup in wizard

Completed these pages. THe wizard still needs some work.
MythTV · May 5, 2023 · d1264bd · d1264bd
1 parent 3312779
commit d1264bd
Show file tree

Hide file tree

Showing 14 changed files with 441 additions and 329 deletions.
diff --git a/mythtv/html/assets/i18n/en_US.json b/mythtv/html/assets/i18n/en_US.json
@@ -158,9 +158,16 @@
     "setupDatabase": "Database Setup",
     "setupNetwork": "Backend Network",
     "setupStorageGroups": "Storage Groups",
-    "testConnection": "Test Connection",
+    "testConnection": "Test Database Connection",
     "title": "Initial Setup Wizard",
-    "userRequired": "User is required"
+    "userRequired": "User is required",
+    "connectionsuccess": "Connection to database was successful",
+    "connectionfail": "Unsuccessful connection to database",
+    "ipaddress_help": "The hostname or IP address of the machine hosting the database.",
+    "port_help": "The port number the database is running on. This is usually the default 3306.",
+    "user_help": "The MySQL user name to use while connecting to the database. The default is mythtv.",
+    "password_help": "The MySQL password to use while connecting to the database.",
+    "dbname_help": "The name of the database. This is usually 'mythconverg'."
   },
   "testbed": {
     "title": "This is a testbed area",

diff --git a/mythtv/html/assets/i18n/nl.json b/mythtv/html/assets/i18n/nl.json
@@ -1,49 +1,5 @@
 {
-    "primeng": {
-        "startsWith": "Starts with",
-        "contains": "Contains",
-        "notContains": "Not contains",
-        "endsWith": "Ends with",
-        "equals": "Equals",
-        "notEquals": "Not equals",
-        "noFilter": "No Filter",
-        "lt": "Less than",
-        "lte": "Less than or equal to",
-        "gt": "Greater than",
-        "gte": "Greater than or equal to",
-        "is": "Is",
-        "isNot": "Is not",
-        "before": "Before",
-        "after": "After",
-        "dateIs": "Date is",
-        "dateIsNot": "Date is not",
-        "dateBefore": "Date is before",
-        "dateAfter": "Date is after",
-        "clear": "Clear",
-        "apply": "Apply",
-        "matchAll": "Match All",
-        "matchAny": "Match Any",
-        "addRule": "Add Rule",
-        "removeRule": "Remove Rule",
-        "accept": "Yes",
-        "reject": "No",
-        "choose": "Choose",
-        "upload": "Upload",
-        "cancel": "Cancel",
-        "dayNames": ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-        "dayNamesShort": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-        "dayNamesMin": ["Su","Mo","Tu","We","Th","Fr","Sa"],
-        "monthNames": ["January","February","March","April","May","June","July","August","September","October","November","December"],
-        "monthNamesShort": ["Jan", "Feb", "Mar", "Apr", "May", "Jun","Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-        "dateFormat": "mm/dd/yy",
-        "firstDayOfWeek": 0,
-        "today": "Today",
-        "weekHeader": "Wk",
-        "weak": "Weak",
-        "medium": "Medium",
-        "strong": "Strong",
-        "passwordPrompt": "Enter a password",
-        "emptyMessage": "No results found",
-        "emptyFilterMessage": "No results found"
+    "setupwizard": {
+        "title": "Initiële Installatiewizard"
     }
-} 
+}
diff --git a/mythtv/html/backend/src/app/config/backend-warning/backend-warning.component.html b/mythtv/html/backend/src/app/config/backend-warning/backend-warning.component.html
@@ -1,42 +1,45 @@
 <div class="block card w-full">
     <div class="block">
         <h1 style="text-align: center;">{{ 'settings.main.title' | translate }}</h1>
-        <div *ngIf="retryCount == 0">
-            <p>{{ 'settings.main.schedstatus' | translate }}:
-                <b *ngIf="setupService.schedulingEnabled">{{ 'settings.main.schedenabled' | translate }}</b>
-                <b *ngIf="!setupService.schedulingEnabled">{{ 'settings.main.scheddisabled' | translate }}</b>
-            </p>
-            <p *ngIf="upComing.length > 0">
-                {{ 'settings.main.upcomingrec' |
-                translate: { Title: upComing[0].Title, StartTime: recStartTime, Status: recStatusDesc } }}
-            </p>
-            <p *ngIf="upComing.length == 0 && ready">
-                {{ 'settings.main.noupcomingrec' | translate }}
-            </p>
-            <div *ngIf="setupService.schedulingEnabled">
-                <p-message severity="warn"
-                    text="{{ 'settings.main.savedisabled_warning' | translate }}"></p-message>
-                <p>
-                    {{ 'settings.main.savedisabled_desc' | translate }}
+        <p-card class="m-5">
+            <div *ngIf="retryCount == 0">
+                <p>{{ 'settings.main.schedstatus' | translate }}:
+                    <b *ngIf="setupService.schedulingEnabled">{{ 'settings.main.schedenabled' | translate }}</b>
+                    <b *ngIf="!setupService.schedulingEnabled">{{ 'settings.main.scheddisabled' | translate }}</b>
+                </p>
+                <p *ngIf="upComing.length > 0">
+                    {{ 'settings.main.upcomingrec' |
+                    translate: { Title: upComing[0].Title, StartTime: recStartTime, Status: recStatusDesc } }}
                 </p>
+                <p *ngIf="upComing.length == 0 && ready">
+                    {{ 'settings.main.noupcomingrec' | translate }}
+                </p>
+                <div *ngIf="setupService.schedulingEnabled">
+                    <p-message severity="warn"
+                        text="{{ 'settings.main.savedisabled_warning' | translate }}"></p-message>
+                    <p>
+                        {{ 'settings.main.savedisabled_desc' | translate }}
+                    </p>
+                </div>
+                <div *ngIf="!setupService.schedulingEnabled">
+                    <p-message severity="warn"
+                        text="{{ 'settings.main.scheddisabled_warning' | translate }}"></p-message>
+                    <p>
+                        {{ 'settings.main.scheddisabled_desc' | translate }}
+                    </p>
+                </div>
             </div>
-            <div *ngIf="!setupService.schedulingEnabled">
-                <p-message severity="warn" text="{{ 'settings.main.scheddisabled_warning' | translate }}"></p-message>
+            <div class="block">
+                <p-button class="col pr-1" label="Disable Scheduler" icon="pi pi-save" iconPos="left"
+                    (onClick)="disableSched();"
+                    [disabled]="!setupService.schedulingEnabled || retryCount > 0"></p-button>
+                <p-button class="col pr-1" label="Restart Backend" icon="pi pi-save" iconPos="left"
+                    (onClick)="restart();" [disabled]="setupService.schedulingEnabled || retryCount > 0"></p-button>
+                <p-progressSpinner *ngIf="retryCount > 0"></p-progressSpinner>
                 <p>
-                    {{ 'settings.main.scheddisabled_desc' | translate }}
+                    <p-message *ngIf="this.errorCount > 0 && retryCount == 0" severity="error"
+                        text="{{ 'common.networkfail' | translate }}"></p-message>
                 </p>
             </div>
-        </div>
-    </div>
-    <div class="block">
-        <p-button class="col pr-1" label="Disable Scheduler" icon="pi pi-save" iconPos="left"
-            (onClick)="disableSched();" [disabled]="!setupService.schedulingEnabled || retryCount > 0"></p-button>
-        <p-button class="col pr-1" label="Restart Backend" icon="pi pi-save" iconPos="left" (onClick)="restart();"
-            [disabled]="setupService.schedulingEnabled || retryCount > 0"></p-button>
-        <p-progressSpinner *ngIf="retryCount > 0"></p-progressSpinner>
-        <p>
-            <p-message *ngIf="this.errorCount > 0 && retryCount == 0" severity="error"
-                text="{{ 'common.networkfail' | translate }}"></p-message>
-        </p>
-    </div>
-</div>
+        </p-card>
+    </div>