Merge pull request #325 from macadmins/fixes

Fix reported issues from 1.1.6 pre-release
macadmins · Feb 23, 2022 · 3301024 · 3301024
2 parents a3a308c + cbf0199
commit 3301024
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -43,17 +43,21 @@ struct SimpleMode: View {
 
                 // Days or Hours Remaining
                 HStack(spacing: 3.5) {
-                    if 0 >= viewObserved.daysRemaining && !Utils().demoModeEnabled() {
-                        Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
-                        Spacer()
-                        Text(String(viewObserved.hoursRemaining))
-                            .foregroundColor(.red)
-                            .fontWeight(.bold)
-                    } else {
+                    if (viewObserved.daysRemaining > 0 && !Utils().demoModeEnabled()) || Utils().demoModeEnabled() {
                         Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
-                        Spacer()
                         Text(String(viewObserved.daysRemaining))
                             .foregroundColor(.secondary)
+                    } else if viewObserved.daysRemaining == 0 && !Utils().demoModeEnabled() {
+                            Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                            Text(String(viewObserved.hoursRemaining))
+                                .foregroundColor(.red)
+                                .fontWeight(.bold)
+                    } else {
+                        Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                        Text(String(viewObserved.daysRemaining))
+                            .foregroundColor(.red)
+                            .fontWeight(.bold)
+
                     }
                 }
 

diff --git a/Nudge/UI/StandardMode/LeftSide.swift b/Nudge/UI/StandardMode/LeftSide.swift
@@ -62,17 +62,24 @@ struct StandardModeLeftSide: View {
 
                     // Days or Hours Remaining
                     HStack{
-                        if 0 >= viewObserved.daysRemaining && !Utils().demoModeEnabled() {
-                            Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                        if (viewObserved.daysRemaining > 0 && !Utils().demoModeEnabled()) || Utils().demoModeEnabled() {
+                            Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                             Spacer()
-                            Text(String(viewObserved.hoursRemaining))
-                                .foregroundColor(.red)
-                                .fontWeight(.bold)
+                            Text(String(viewObserved.daysRemaining))
+                                .foregroundColor(.secondary)
+                        } else if viewObserved.daysRemaining == 0 && !Utils().demoModeEnabled() {
+                                Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                                Spacer()
+                                Text(String(viewObserved.hoursRemaining))
+                                    .foregroundColor(.red)
+                                    .fontWeight(.bold)
                         } else {
                             Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                             Spacer()
                             Text(String(viewObserved.daysRemaining))
-                                .foregroundColor(.secondary)
+                                .foregroundColor(.red)
+                                .fontWeight(.bold)
+
                         }
                     }
 

diff --git a/it.lproj/Localizable.strings b/it.lproj/Localizable.strings
@@ -41,16 +41,16 @@
 
  //// Right side of Nudge
  "Update Device" = "Aggiorna dispositivo";
- "Your device will restart during this update" = "Il dispositivo si riavvierà durante questo aggiornamento";
+ "Your device will restart during this update" = "Il dispositivo si riavvierà durante l'aggiornamento";
  "Important Notes" = "Note importanti";
  "Updates can take around 30 minutes to complete" = "Il completamento degli aggiornamenti richiede circa 30 minuti";
- "A fully up-to-date device is required to ensure that IT can accurately protect your device.\n\nIf you do not update your device, you may lose access to some items necessary for your day-to-day tasks.\n\nTo begin the update, simply click on the Update Device button and follow the provided steps." = "Et datamaskin med de siste oppdateringene kreves for at IT skal kunne sikre at datamaskinen din er beskyttet.\n\nHvis du ikke oppdaterer datamaskinen, kan det hende du ikke får tilgang til de nødvendige ressursene.\n\nFor å starte oppdateringen, klikk på Oppdater og følg trinnene.";
+ "A fully up-to-date device is required to ensure that IT can accurately protect your device.\n\nIf you do not update your device, you may lose access to some items necessary for your day-to-day tasks.\n\nTo begin the update, simply click on the Update Device button and follow the provided steps." = "È necessario un dispositivo completamente aggiornato per garantire che l'IT possa proteggere accuratamente il tuo dispositivo.\n\nSe non aggiorni il dispositivo, potresti perdere l'accesso ad alcuni elementi necessari per le tue attività quotidiane.\n\nPer iniziare l'aggiornamento, fai semplicemente clic sul pulsante Aggiorna dispositivo e segui i passaggi forniti.";
  "Your device requires a security update" = "Il tuo dispositivo richiede un aggiornamento di sicurezza";
  "Your device requires a security update (Demo Mode)" = "Il tuo dispositivo richiede un aggiornamento di sicurezza (modalità demo)";
  "Later" = "Dopo";
  "I understand" = "Ho capito";
  "A friendly reminder from your local IT team" = "Un cortese promemoria dal tuo team IT locale";
  "Defer" = "Posticipa";
- "One Hour" = "Un'ora'";
+ "One Hour" = "Un'ora";
  "One Day" = "Un giorno";
  "Custom" = "Personalizzato";