Skip to content

Commit 02ad1ca

Browse files
committed
Merge branch 'unite2025/add-localization' into unite2025/lsp-uitk
2 parents 945e03c + a463f3c commit 02ad1ca

File tree

6 files changed

+58
-14
lines changed

6 files changed

+58
-14
lines changed

Assets/Localization/String Tables/Game Text Shared Data.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,22 @@ MonoBehaviour:
159159
m_Key: SHOW_RESULTS
160160
m_Metadata:
161161
m_Items: []
162+
- m_Id: 1468861612453888
163+
m_Key: OS_SETTINGS_LABEL
164+
m_Metadata:
165+
m_Items: []
166+
- m_Id: 1469259735789568
167+
m_Key: CLOSED_CAPTIONS_LABEL
168+
m_Metadata:
169+
m_Items: []
170+
- m_Id: 1475968126578688
171+
m_Key: BOLD_TEXT_LABEL
172+
m_Metadata:
173+
m_Items: []
174+
- m_Id: 1476009310449664
175+
m_Key: FONT_SCALE_LABEL
176+
m_Metadata:
177+
m_Items: []
162178
m_Metadata:
163179
m_Items: []
164180
m_KeyGenerator:

Assets/Localization/String Tables/Game Text_ar.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ MonoBehaviour:
155155
m_Metadata:
156156
m_Items: []
157157
- m_Id: 36559753736192
158-
m_Localized: "\u0627\u0644\u064A\u0627\u0628\u0627\u0646\u064A\u0629 (\u65E5\u672C\u8A9E)"
158+
m_Localized:
159159
m_Metadata:
160160
m_Items: []
161161
- m_Id: 36785994493952
162-
m_Localized: "\u0627\u0644\u0644\u063A\u0629"
162+
m_Localized:
163163
m_Metadata:
164164
m_Items: []
165165
- m_Id: 45343066714112
166-
m_Localized: "{orderedWordCount} \u0645\u0646 {totalWordCount} \u0635\u062D\u064A\u062D"
166+
m_Localized:
167167
m_Metadata:
168168
m_Items:
169169
- rid: 2216566543976235776

Assets/Localization/String Tables/Game Text_en.asset

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,18 @@ MonoBehaviour:
167167
m_Metadata:
168168
m_Items:
169169
- rid: 2216566543976235777
170+
- m_Id: 1468861612453888
171+
m_Localized: OS Settings (read-only)
172+
m_Metadata:
173+
m_Items: []
174+
- m_Id: 1469259735789568
175+
m_Localized: Closed Captions
176+
m_Metadata:
177+
m_Items: []
178+
- m_Id: 1475968126578688
179+
m_Localized: Bold Text
180+
m_Metadata:
181+
m_Items: []
170182
references:
171183
version: 2
172184
RefIds:

Assets/Localization/String Tables/Game Text_es.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ MonoBehaviour:
152152
m_Metadata:
153153
m_Items: []
154154
- m_Id: 36559753736192
155-
m_Localized: "Japon\xE9s (\u65E5\u672C\u8A9E)"
155+
m_Localized:
156156
m_Metadata:
157157
m_Items: []
158158
- m_Id: 36785994493952
159-
m_Localized: Idioma
159+
m_Localized:
160160
m_Metadata:
161161
m_Items: []
162162
- m_Id: 45343066714112
163-
m_Localized: '{orderedWordCount} de {totalWordCount} correctas'
163+
m_Localized:
164164
m_Metadata:
165165
m_Items:
166166
- rid: 2216566543976235779

Assets/Localization/String Tables/Game Text_ja.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ MonoBehaviour:
152152
m_Metadata:
153153
m_Items: []
154154
- m_Id: 36559753736192
155-
m_Localized: "\u65E5\u672C\u8A9E"
155+
m_Localized:
156156
m_Metadata:
157157
m_Items: []
158158
- m_Id: 36785994493952
159-
m_Localized: "\u8A00\u8A9E"
159+
m_Localized:
160160
m_Metadata:
161161
m_Items: []
162162
- m_Id: 45343066714112
163-
m_Localized: "{totalWordCount}\u554F\u4E2D{orderedWordCount}\u554F\u6B63\u89E3"
163+
m_Localized:
164164
m_Metadata:
165165
m_Items:
166166
- rid: 2216566543976235778

Assets/Resources/UITk/MainView.uxml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ui:VisualElement name="root" style="flex-grow: 1;">
44
<ui:VisualElement name="background" style="flex-grow: 1; position: absolute; top: 0; left: 0; bottom: 0; right: 0; background-color: rgb(11, 163, 109);"/>
55
<ui:VisualElement name="viewContainer" style="flex-grow: 1;">
6-
<Unity.Samples.LetterSpell.StackView name="stackView" index="0" style="flex-grow: 1;">
6+
<Unity.Samples.LetterSpell.StackView name="stackView" index="4" style="flex-grow: 1;">
77
<ui:VisualElement name="splashView" style="flex-grow: 1; background-image: url(&quot;project://database/Assets/UI/Images/Splash-Screen.png?fileID=4602334432413793429&amp;guid=364b68ded9ed04f07848b6c7de25fdad&amp;type=3#Intro Screen_0&quot;);">
88
<ui:Label text="A fun spelling game" name="splashSubTitle"/>
99
</ui:VisualElement>
@@ -172,25 +172,41 @@
172172
<UnityEngine.Localization.LocalizedString property="label" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(19534851502080)"/>
173173
</Bindings>
174174
</ui:Slider>
175-
<ui:Label text="OS Settings (read-only)" class="settings-header-label"/>
175+
<ui:Label class="settings-header-label">
176+
<Bindings>
177+
<UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(1468861612453888)"/>
178+
</Bindings>
179+
</ui:Label>
176180
<ui:VisualElement class="row unity-base-field" style="flex-grow: 1;">
177-
<ui:Label text="Closed Captions" class="unity-base-field__label"/>
181+
<ui:Label class="unity-base-field__label">
182+
<Bindings>
183+
<UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(1469259735789568)"/>
184+
</Bindings>
185+
</ui:Label>
178186
<ui:Label text="On" name="closedCaptionsLabel">
179187
<Bindings>
180188
<ui:DataBinding property="text" data-source-path="closedCaptionsEnabledText" binding-mode="ToTarget"/>
181189
</Bindings>
182190
</ui:Label>
183191
</ui:VisualElement>
184192
<ui:VisualElement class="row unity-base-field" style="flex-grow: 1;">
185-
<ui:Label text="Bold Text" class="unity-base-field__label"/>
193+
<ui:Label text="Bold Text" class="unity-base-field__label">
194+
<Bindings>
195+
<UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(1475968126578688)"/>
196+
</Bindings>
197+
</ui:Label>
186198
<ui:Label text="On" name="boldTextLabel">
187199
<Bindings>
188200
<ui:DataBinding property="text" data-source-path="boldTextEnabledText" binding-mode="ToTarget"/>
189201
</Bindings>
190202
</ui:Label>
191203
</ui:VisualElement>
192204
<ui:VisualElement class="row unity-base-field" style="flex-grow: 1;">
193-
<ui:Label text="Font Scale" class="unity-base-field__label"/>
205+
<ui:Label class="unity-base-field__label">
206+
<Bindings>
207+
<UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(1476009310449664)"/>
208+
</Bindings>
209+
</ui:Label>
194210
<ui:Label text="1.0" name="fontScaleLabel">
195211
<Bindings>
196212
<ui:DataBinding property="text" data-source-path="fontScale" binding-mode="ToTarget"/>

0 commit comments

Comments
 (0)