Skip to content

Use zh instead of en for nan UI #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theimpulson merged 1 commit into from
Aug 6, 2025
Merged

Use zh instead of en for nan UI #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/src/main/java/app/opass/ccip/model/Room.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/app/opass/ccip/model/Session.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
5 changes: 4 additions & 1 deletion app/src/main/java/app/opass/ccip/model/SessionLang.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/app/opass/ccip/model/SessionTag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/app/opass/ccip/model/SessionType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/app/opass/ccip/model/Speaker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
8 changes: 4 additions & 4 deletions app/src/main/java/app/opass/ccip/ui/announcement/AnnouncementAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/app/opass/ccip/ui/fastpass/ScenarioAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down