diff --git a/app/src/main/java/app/opass/ccip/model/Room.kt b/app/src/main/java/app/opass/ccip/model/Room.kt
index f55ab6da..a759f764 100644
--- a/app/src/main/java/app/opass/ccip/model/Room.kt
+++ b/app/src/main/java/app/opass/ccip/model/Room.kt
@@ -10,7 +10,10 @@ data class Room(
     val en: En
 ) {
     fun getDetails(context: Context) =
-        if (LocaleUtil.getCurrentLocale(context).language == Locale("zh").language) zh else en
+        when (LocaleUtil.getCurrentLocale(context).language) {
+            "nan", "zh" -> zh
+            else -> en
+        }
 
     interface LocalizedDetail {
         val name: String
diff --git a/app/src/main/java/app/opass/ccip/model/Session.kt b/app/src/main/java/app/opass/ccip/model/Session.kt
index 0af7b6f5..e06cd29f 100644
--- a/app/src/main/java/app/opass/ccip/model/Session.kt
+++ b/app/src/main/java/app/opass/ccip/model/Session.kt
@@ -26,10 +26,9 @@ data class Session(
     val tags: List<SessionTag>
 ) {
     fun getSessionDetail(context: Context): SessionDetail {
-        return if (LocaleUtil.getCurrentLocale(context).language == Locale("zh").language) {
-            zh
-        } else {
-            en
+        return when (LocaleUtil.getCurrentLocale(context).language) {
+            "nan", "zh" -> zh
+            else -> en
         }
     }
 }
diff --git a/app/src/main/java/app/opass/ccip/model/SessionLang.kt b/app/src/main/java/app/opass/ccip/model/SessionLang.kt
index 62717ef2..20fc5831 100644
--- a/app/src/main/java/app/opass/ccip/model/SessionLang.kt
+++ b/app/src/main/java/app/opass/ccip/model/SessionLang.kt
@@ -10,7 +10,10 @@ data class SessionLang(
     val en: En
 ) {
     fun getDetails(context: Context) =
-        if (LocaleUtil.getCurrentLocale(context).language == Locale("zh").language) zh else en
+        when (LocaleUtil.getCurrentLocale(context).language) {
+            "nan", "zh" -> zh
+            else -> en
+        }
 
     interface LocalizedDetail {
         val name: String
diff --git a/app/src/main/java/app/opass/ccip/model/SessionTag.kt b/app/src/main/java/app/opass/ccip/model/SessionTag.kt
index 43d8620f..633e15ab 100644
--- a/app/src/main/java/app/opass/ccip/model/SessionTag.kt
+++ b/app/src/main/java/app/opass/ccip/model/SessionTag.kt
@@ -10,7 +10,10 @@ data class SessionTag(
     val en: En
 ) {
     fun getDetails(context: Context) =
-        if (LocaleUtil.getCurrentLocale(context).language == Locale("zh").language) zh else en
+        when (LocaleUtil.getCurrentLocale(context).language) {
+            "nan", "zh" -> zh
+            else -> en
+        }
 
     interface LocalizedDetail {
         val name: String
diff --git a/app/src/main/java/app/opass/ccip/model/SessionType.kt b/app/src/main/java/app/opass/ccip/model/SessionType.kt
index 2313ead4..244d7203 100644
--- a/app/src/main/java/app/opass/ccip/model/SessionType.kt
+++ b/app/src/main/java/app/opass/ccip/model/SessionType.kt
@@ -10,7 +10,10 @@ data class SessionType(
     val en: En
 ) {
     fun getDetails(context: Context) =
-        if (LocaleUtil.getCurrentLocale(context).language == Locale("zh").language) zh else en
+        when (LocaleUtil.getCurrentLocale(context).language) {
+            "nan", "zh" -> zh
+            else -> en
+        }
 
     interface LocalizedDetail {
         val name: String
diff --git a/app/src/main/java/app/opass/ccip/model/Speaker.kt b/app/src/main/java/app/opass/ccip/model/Speaker.kt
index 23e1c34b..89d87985 100644
--- a/app/src/main/java/app/opass/ccip/model/Speaker.kt
+++ b/app/src/main/java/app/opass/ccip/model/Speaker.kt
@@ -11,10 +11,9 @@ data class Speaker(
     val en: En_
 ) {
     fun getSpeakerDetail(context: Context): SpeakerDetail {
-        return if (LocaleUtil.getCurrentLocale(context).language == Locale("zh").language) {
-            zh
-        } else {
-            en
+        return when (LocaleUtil.getCurrentLocale(context).language) {
+            "nan", "zh" -> zh
+            else -> en
         }
     }
 }
diff --git a/app/src/main/java/app/opass/ccip/ui/announcement/AnnouncementAdapter.kt b/app/src/main/java/app/opass/ccip/ui/announcement/AnnouncementAdapter.kt
index 7111ce94..e670490e 100644
--- a/app/src/main/java/app/opass/ccip/ui/announcement/AnnouncementAdapter.kt
+++ b/app/src/main/java/app/opass/ccip/ui/announcement/AnnouncementAdapter.kt
@@ -37,10 +37,10 @@ class AnnouncementAdapter(private val mContext: Context, private val announcemen
         val sdf = SimpleDateFormat("MM/dd HH:mm")
         val (datetime, msgEn, msgZh, uri) = announcementList[position]
 
-        if (LocaleUtil.getCurrentLocale(mContext).toString().startsWith(Locale.TAIWAN.toString())) {
-            holder.msg.text = msgZh
-        } else {
-            holder.msg.text = msgEn
+
+        holder.msg.text = when (LocaleUtil.getCurrentLocale(mContext).language) {
+            "nan", "zh" -> msgZh
+            else -> msgEn
         }
         holder.time.text = sdf.format(Date(datetime * 1000L))
         holder.itemView.setOnClickListener {
diff --git a/app/src/main/java/app/opass/ccip/ui/fastpass/ScenarioAdapter.kt b/app/src/main/java/app/opass/ccip/ui/fastpass/ScenarioAdapter.kt
index 2fa85ee9..45a5d4fe 100644
--- a/app/src/main/java/app/opass/ccip/ui/fastpass/ScenarioAdapter.kt
+++ b/app/src/main/java/app/opass/ccip/ui/fastpass/ScenarioAdapter.kt
@@ -57,10 +57,9 @@ class ScenarioAdapter(
 
         holder.scenarioIcon.alpha = 1f
 
-        if (LocaleUtil.getCurrentLocale(mContext).toString().startsWith(Locale.TAIWAN.toString())) {
-            holder.scenarioName.text = scenario.displayText.zhTW
-        } else {
-            holder.scenarioName.text = scenario.displayText.enUS
+        holder.scenarioName.text = when (LocaleUtil.getCurrentLocale(mContext).language) {
+            "nan", "zh" -> scenario.displayText.zhTW
+            else -> scenario.displayText.enUS
         }
 
         holder.scenarioName.setTextColor(ContextCompat.getColor(mContext, android.R.color.black))