From 6f3898a73dd060566f7a4d77e39941452b96ac86 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Tue, 11 Nov 2014 12:44:06 +0100
Subject: [PATCH] Use Retranslator in LocalePage.

---
 src/modules/locale/LocalePage.cpp | 30 +++++++-----------------------
 src/modules/locale/LocalePage.h   |  5 -----
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index a6476da08..1add9c3b0 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -20,6 +20,7 @@
 
 #include "timezonewidget/timezonewidget.h"
 #include "SetTimezoneJob.h"
+#include "utils/Retranslator.h"
 
 #include <QBoxLayout>
 #include <QComboBox>
@@ -119,6 +120,12 @@ LocalePage::LocalePage( QWidget* parent )
 
         m_blockTzWidgetSet = false;
     });
+
+    new CalamaresUtils::Retranslator( this, [this]
+    {
+        m_cityLabel->setText( tr( "Region:" ) );
+        m_timezoneLabel->setText( tr( "Zone:" ) );
+    } );
 }
 
 
@@ -193,26 +200,3 @@ LocalePage::createJobs()
     return list;
 }
 
-
-void
-LocalePage::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            retranslate();
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-LocalePage::retranslate()
-{
-    m_cityLabel->setText( tr( "Region:" ) );
-    m_timezoneLabel->setText( tr( "Zone:" ) );
-}
diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h
index 86fc7e165..71b1da770 100644
--- a/src/modules/locale/LocalePage.h
+++ b/src/modules/locale/LocalePage.h
@@ -39,12 +39,7 @@ public:
 
     QList< Calamares::job_ptr > createJobs();
 
-protected:
-    void changeEvent( QEvent* e ) override;
-
 private:
-    void retranslate();
-
     TimeZoneWidget* m_tzWidget;
     QComboBox* m_regionCombo;
     QComboBox* m_timezoneCombo;