Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<resources>
<string name="matchNumber">¿Número de Partido?</string>
<string name="nameOfPerson">¡Tu Nombre!</string>
<string name="teamNumber">¿Número de Equipo?</string>
<string name="auto_shoot_preload">Disparo Precargado</string>
<string name="auto_fuel_outpost">Combustible del Puesto de Avanzada</string>
<string name="auto_fuel_depot">Combustible del Depósito</string>
<string name="auto_fuel_neutral">Combustible de la Zona Neutral</string>
<string name="cycles">Cycles</string>
<string name="herding">Herding</string>
<string name="incap">incapacitated</string>
</resources>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<resources>
<!--This is kannada translations -->
<string name="matchNumber">Match sankhye enu?</string>
<string name="nameOfPerson">ninna hesarenu!</string>
<string name="teamNumber">Team sankhye eshtu?</string>
<string name="auto_shoot_preload">Shot Ready maadi</string>
<string name="auto_fuel_outpost">Outpost inda Indhana</string>
<string name="auto_fuel_depot">Depot inda Indhana</string>
<string name="auto_fuel_neutral">Nuetral Zone inda Indhana</string>
<string name="cycles">Chakra</string>
<string name="herding">Chendugalannu ottu maaduvudu</string>
<string name="incap">Asamartha</string>
</resources>

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what language is this? This has the language code for Czech.
It looks like Japaneese or Chineese; here are the language codes for them:
Chinese: zh
Japanese: ja

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its mandarin simplified let me see how to differentiate them and I'll see if I can find the proper language code

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cuase mandarin there tradiational and simplfied

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like currently, compose multiplatform doesn't support having different resources for different scripts, like Hans and Hant (see https://youtrack.jetbrains.com/issue/CMP-4449/Ability-to-support-more-language-and-region-qualifiers). It does support region codes (like https://developer.android.com/guide/topics/resources/app-languages#locale-names). If we want to have both traditional and simplified, the best we can do right now is to use the regions where simplified and traditional are used.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the research, for simplified I'll do china(rCN) and traditional Taiwan(rTW)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to use resources for different scripts (like Hans and Hant) once Compose Multiplatform version 1.12.0 comes out, since support for it was added 3 weeks ago (so if we want to use it we just need to wait for the next release)

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<resources>
<!--This is mandarin simplified translations -->
<string name="matchNumber">比赛编号</string>
<string name="nameOfPerson">记录人姓名</string>
<string name="teamNumber">队伍编号</string>
<string name="auto_shoot_preload">预装弹发射数</string>
<string name="auto_fuel_outpost">来自前哨站的燃料数</string>
<string name="auto_fuel_depot">来自补给站的燃料数</string>
<string name="auto_fuel_neutral">来自中立区的燃料数</string>
<string name="cycles">Cycles</string>
<string name="herding">Herding</string>
<string name="incap">incapacitated</string>
</resources>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<resources>
<!--This is mandarin traditional translations -->
<!--This is for emulator testing will update once I get translations -->
<string name="matchNumber">匹配號碼</string>
<string name="nameOfPerson">隊員姓名</string>
<string name="teamNumber">隊號</string>
<string name="auto_shoot_preload">射擊預裝</string>
<string name="auto_fuel_outpost">球來自隊員裝球位</string>
<string name="auto_fuel_depot">球來自取球倉</string>
<string name="auto_fuel_neutral">球來自中立區</string>
<string name="cycles">:循環次數</string>
<string name="herding">運球</string>
<string name="incap">停止運作</string>
</resources>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<resources>
<string name="matchNumber">Match Number???</string>
<string name="nameOfPerson">Your Name Human!</string>
<string name="teamNumber">TeamNumber ;)</string>
<string name="auto_shoot_preload">Shot Preload</string>
<string name="auto_fuel_outpost">Fuel from Outpost</string>
<string name="auto_fuel_depot">Fuel from Depot</string>
Expand Down
3 changes: 0 additions & 3 deletions composeApp/src/commonMain/composeResources/values/teleop.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ import scoutingapp2026.composeapp.generated.resources.auto_fuel_depot
import scoutingapp2026.composeapp.generated.resources.auto_fuel_neutral
import scoutingapp2026.composeapp.generated.resources.auto_fuel_outpost
import scoutingapp2026.composeapp.generated.resources.auto_shoot_preload
import scoutingapp2026.composeapp.generated.resources.matchNumber
import scoutingapp2026.composeapp.generated.resources.nameOfPerson
import scoutingapp2026.composeapp.generated.resources.teamNumber
import scoutingapp2026.composeapp.generated.resources.cycles
import scoutingapp2026.composeapp.generated.resources.herding
import scoutingapp2026.composeapp.generated.resources.incap
import scoutingapp2026.composeapp.generated.resources.matchNumber
import scoutingapp2026.composeapp.generated.resources.nameOfPerson
import scoutingapp2026.composeapp.generated.resources.teamNumber

@Composable
fun IncrementButton(
Expand Down Expand Up @@ -294,8 +294,10 @@ fun Teleoperated(
modifier = Modifier.fillMaxWidth(0.5f),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(20.dp)) {
IncrementButton(stringResource(Res.string.cycles),
teleopData.Cycles, enabled = true)
IncrementButton(
stringResource(Res.string.cycles),
teleopData.Cycles,
enabled = true)
}
}
val fuelAmount = mutableIntStateOf(0)
Expand Down