Skip to content

Commit 9534b2b

Browse files
csigscsigs
authored
LEGO: Merge pull request 49590
LEGO: Merge pull request 49590
1 parent 5c4caaf commit 9534b2b

File tree

13 files changed

+409
-31
lines changed

13 files changed

+409
-31
lines changed

‎src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,24 @@
12421242
</Str>
12431243
<Disp Icon="Str" />
12441244
</Item>
1245+
<Item ItemId=";Add_extends_constraint_2211" ItemType="0" PsrId="306" Leaf="true">
1246+
<Str Cat="Text">
1247+
<Val><![CDATA[Add `extends` constraint.]]></Val>
1248+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1249+
<Val><![CDATA[添加 `extends` 约束。]]></Val>
1250+
</Tgt>
1251+
</Str>
1252+
<Disp Icon="Str" />
1253+
</Item>
1254+
<Item ItemId=";Add_extends_constraint_to_all_type_parameters_2212" ItemType="0" PsrId="306" Leaf="true">
1255+
<Str Cat="Text">
1256+
<Val><![CDATA[Add `extends` constraint to all type parameters]]></Val>
1257+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1258+
<Val><![CDATA[将 `extends` 约束添加到所有类型参数]]></Val>
1259+
</Tgt>
1260+
</Str>
1261+
<Disp Icon="Str" />
1262+
</Item>
12451263
<Item ItemId=";Add_import_from_0_90057" ItemType="0" PsrId="306" Leaf="true">
12461264
<Str Cat="Text">
12471265
<Val><![CDATA[Add import from "{0}"]]></Val>
@@ -13830,11 +13848,11 @@
1383013848
</Str>
1383113849
<Disp Icon="Str" />
1383213850
</Item>
13833-
<Item ItemId=";This_type_parameter_probably_needs_an_extends_object_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
13851+
<Item ItemId=";This_type_parameter_might_need_an_extends_0_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
1383413852
<Str Cat="Text">
13835-
<Val><![CDATA[This type parameter probably needs an `extends object` constraint.]]></Val>
13853+
<Val><![CDATA[This type parameter might need an `extends {0}` constraint.]]></Val>
1383613854
<Tgt Cat="Text" Stat="Loc" Orig="New">
13837-
<Val><![CDATA[此类型参数可能需要 "extends object" 约束。]]></Val>
13855+
<Val><![CDATA[此类型参数可能需要 `extends {0}` 约束。]]></Val>
1383813856
</Tgt>
1383913857
</Str>
1384013858
<Disp Icon="Str" />
@@ -15264,6 +15282,15 @@
1526415282
</Str>
1526515283
<Disp Icon="Str" />
1526615284
</Item>
15285+
<Item ItemId=";We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843" ItemType="0" PsrId="306" Leaf="true">
15286+
<Str Cat="Text">
15287+
<Val><![CDATA[We can only write a type for '{0}' by adding a type for the entire parameter here.]]></Val>
15288+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15289+
<Val><![CDATA[我们只能通过在此处为整个参数添加类型来写入“{0}”的类型。]]></Val>
15290+
</Tgt>
15291+
</Str>
15292+
<Disp Icon="Str" />
15293+
</Item>
1526715294
<Item ItemId=";When_assigning_functions_check_to_ensure_parameters_and_the_return_values_are_subtype_compatible_6698" ItemType="0" PsrId="306" Leaf="true">
1526815295
<Str Cat="Text">
1526915296
<Val><![CDATA[When assigning functions, check to ensure parameters and the return values are subtype-compatible.]]></Val>
@@ -15618,6 +15645,15 @@
1561815645
</Str>
1561915646
<Disp Icon="Str" />
1562015647
</Item>
15648+
<Item ItemId=";_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842" ItemType="0" PsrId="306" Leaf="true">
15649+
<Str Cat="Text">
15650+
<Val><![CDATA['{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?]]></Val>
15651+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15652+
<Val><![CDATA[“{0}”是“{1}”的未使用重命名。是否打算将其用作类型批注?]]></Val>
15653+
</Tgt>
15654+
</Str>
15655+
<Disp Icon="Str" />
15656+
</Item>
1562115657
<Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
1562215658
<Str Cat="Text">
1562315659
<Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>

‎src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,24 @@
12421242
</Str>
12431243
<Disp Icon="Str" />
12441244
</Item>
1245+
<Item ItemId=";Add_extends_constraint_2211" ItemType="0" PsrId="306" Leaf="true">
1246+
<Str Cat="Text">
1247+
<Val><![CDATA[Add `extends` constraint.]]></Val>
1248+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1249+
<Val><![CDATA[新增 'extends' 限制式。]]></Val>
1250+
</Tgt>
1251+
</Str>
1252+
<Disp Icon="Str" />
1253+
</Item>
1254+
<Item ItemId=";Add_extends_constraint_to_all_type_parameters_2212" ItemType="0" PsrId="306" Leaf="true">
1255+
<Str Cat="Text">
1256+
<Val><![CDATA[Add `extends` constraint to all type parameters]]></Val>
1257+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1258+
<Val><![CDATA[將 'extends' 限制式新增至所有類型參數]]></Val>
1259+
</Tgt>
1260+
</Str>
1261+
<Disp Icon="Str" />
1262+
</Item>
12451263
<Item ItemId=";Add_import_from_0_90057" ItemType="0" PsrId="306" Leaf="true">
12461264
<Str Cat="Text">
12471265
<Val><![CDATA[Add import from "{0}"]]></Val>
@@ -13830,11 +13848,11 @@
1383013848
</Str>
1383113849
<Disp Icon="Str" />
1383213850
</Item>
13833-
<Item ItemId=";This_type_parameter_probably_needs_an_extends_object_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
13851+
<Item ItemId=";This_type_parameter_might_need_an_extends_0_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
1383413852
<Str Cat="Text">
13835-
<Val><![CDATA[This type parameter probably needs an `extends object` constraint.]]></Val>
13853+
<Val><![CDATA[This type parameter might need an `extends {0}` constraint.]]></Val>
1383613854
<Tgt Cat="Text" Stat="Loc" Orig="New">
13837-
<Val><![CDATA[此類型參數可能需要 'extends object' 限制式。]]></Val>
13855+
<Val><![CDATA[此類型參數可能需要 'extends {0}' 限制式。]]></Val>
1383813856
</Tgt>
1383913857
</Str>
1384013858
<Disp Icon="Str" />
@@ -15264,6 +15282,15 @@
1526415282
</Str>
1526515283
<Disp Icon="Str" />
1526615284
</Item>
15285+
<Item ItemId=";We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843" ItemType="0" PsrId="306" Leaf="true">
15286+
<Str Cat="Text">
15287+
<Val><![CDATA[We can only write a type for '{0}' by adding a type for the entire parameter here.]]></Val>
15288+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15289+
<Val><![CDATA[我們只能在此新增整個參數的類型，來寫入 '{0}' 的類型。]]></Val>
15290+
</Tgt>
15291+
</Str>
15292+
<Disp Icon="Str" />
15293+
</Item>
1526715294
<Item ItemId=";When_assigning_functions_check_to_ensure_parameters_and_the_return_values_are_subtype_compatible_6698" ItemType="0" PsrId="306" Leaf="true">
1526815295
<Str Cat="Text">
1526915296
<Val><![CDATA[When assigning functions, check to ensure parameters and the return values are subtype-compatible.]]></Val>
@@ -15618,6 +15645,15 @@
1561815645
</Str>
1561915646
<Disp Icon="Str" />
1562015647
</Item>
15648+
<Item ItemId=";_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842" ItemType="0" PsrId="306" Leaf="true">
15649+
<Str Cat="Text">
15650+
<Val><![CDATA['{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?]]></Val>
15651+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15652+
<Val><![CDATA['{0}' 是未使用的 '{1}' 重新命名。您是否想要使用它作為類型註釋?]]></Val>
15653+
</Tgt>
15654+
</Str>
15655+
<Disp Icon="Str" />
15656+
</Item>
1562115657
<Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
1562215658
<Str Cat="Text">
1562315659
<Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>

‎src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,18 @@
12511251
</Str>
12521252
<Disp Icon="Str" />
12531253
</Item>
1254+
<Item ItemId=";Add_extends_constraint_2211" ItemType="0" PsrId="306" Leaf="true">
1255+
<Str Cat="Text">
1256+
<Val><![CDATA[Add `extends` constraint.]]></Val>
1257+
</Str>
1258+
<Disp Icon="Str" />
1259+
</Item>
1260+
<Item ItemId=";Add_extends_constraint_to_all_type_parameters_2212" ItemType="0" PsrId="306" Leaf="true">
1261+
<Str Cat="Text">
1262+
<Val><![CDATA[Add `extends` constraint to all type parameters]]></Val>
1263+
</Str>
1264+
<Disp Icon="Str" />
1265+
</Item>
12541266
<Item ItemId=";Add_import_from_0_90057" ItemType="0" PsrId="306" Leaf="true">
12551267
<Str Cat="Text">
12561268
<Val><![CDATA[Add import from "{0}"]]></Val>
@@ -13839,12 +13851,9 @@
1383913851
</Str>
1384013852
<Disp Icon="Str" />
1384113853
</Item>
13842-
<Item ItemId=";This_type_parameter_probably_needs_an_extends_object_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
13854+
<Item ItemId=";This_type_parameter_might_need_an_extends_0_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
1384313855
<Str Cat="Text">
13844-
<Val><![CDATA[This type parameter probably needs an `extends object` constraint.]]></Val>
13845-
<Tgt Cat="Text" Stat="Loc" Orig="New">
13846-
<Val><![CDATA[Tento parametr typu pravděpodobně potřebuje omezení „extends object“.]]></Val>
13847-
</Tgt>
13856+
<Val><![CDATA[This type parameter might need an `extends {0}` constraint.]]></Val>
1384813857
</Str>
1384913858
<Disp Icon="Str" />
1385013859
</Item>
@@ -15273,6 +15282,15 @@
1527315282
</Str>
1527415283
<Disp Icon="Str" />
1527515284
</Item>
15285+
<Item ItemId=";We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843" ItemType="0" PsrId="306" Leaf="true">
15286+
<Str Cat="Text">
15287+
<Val><![CDATA[We can only write a type for '{0}' by adding a type for the entire parameter here.]]></Val>
15288+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15289+
<Val><![CDATA[Pro {0} můžeme napsat typ jenom tak, že sem přidáme typ pro celý parametr.]]></Val>
15290+
</Tgt>
15291+
</Str>
15292+
<Disp Icon="Str" />
15293+
</Item>
1527615294
<Item ItemId=";When_assigning_functions_check_to_ensure_parameters_and_the_return_values_are_subtype_compatible_6698" ItemType="0" PsrId="306" Leaf="true">
1527715295
<Str Cat="Text">
1527815296
<Val><![CDATA[When assigning functions, check to ensure parameters and the return values are subtype-compatible.]]></Val>
@@ -15627,6 +15645,15 @@
1562715645
</Str>
1562815646
<Disp Icon="Str" />
1562915647
</Item>
15648+
<Item ItemId=";_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842" ItemType="0" PsrId="306" Leaf="true">
15649+
<Str Cat="Text">
15650+
<Val><![CDATA['{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?]]></Val>
15651+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15652+
<Val><![CDATA[{0} je nepoužívané přejmenování {1}. Chtěli jste ji použít jako poznámku typu?]]></Val>
15653+
</Tgt>
15654+
</Str>
15655+
<Disp Icon="Str" />
15656+
</Item>
1563015657
<Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
1563115658
<Str Cat="Text">
1563215659
<Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>

‎src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15258,6 +15258,15 @@
1525815258
</Str>
1525915259
<Disp Icon="Str" />
1526015260
</Item>
15261+
<Item ItemId=";We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843" ItemType="0" PsrId="306" Leaf="true">
15262+
<Str Cat="Text">
15263+
<Val><![CDATA[We can only write a type for '{0}' by adding a type for the entire parameter here.]]></Val>
15264+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15265+
<Val><![CDATA[Wir können nur einen Typ für „{0}“ schreiben, indem hier ein Typ für den gesamten Parameter hinzugefügt wird.]]></Val>
15266+
</Tgt>
15267+
</Str>
15268+
<Disp Icon="Str" />
15269+
</Item>
1526115270
<Item ItemId=";When_assigning_functions_check_to_ensure_parameters_and_the_return_values_are_subtype_compatible_6698" ItemType="0" PsrId="306" Leaf="true">
1526215271
<Str Cat="Text">
1526315272
<Val><![CDATA[When assigning functions, check to ensure parameters and the return values are subtype-compatible.]]></Val>
@@ -15612,6 +15621,15 @@
1561215621
</Str>
1561315622
<Disp Icon="Str" />
1561415623
</Item>
15624+
<Item ItemId=";_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842" ItemType="0" PsrId="306" Leaf="true">
15625+
<Str Cat="Text">
15626+
<Val><![CDATA['{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?]]></Val>
15627+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15628+
<Val><![CDATA[„{0}“ ist eine nicht verwendete Umbenennung von „{1}“. Wollten Sie sie als Typanmerkung verwenden?]]></Val>
15629+
</Tgt>
15630+
</Str>
15631+
<Disp Icon="Str" />
15632+
</Item>
1561515633
<Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
1561615634
<Str Cat="Text">
1561715635
<Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>

‎src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,24 @@
12511251
</Str>
12521252
<Disp Icon="Str" />
12531253
</Item>
1254+
<Item ItemId=";Add_extends_constraint_2211" ItemType="0" PsrId="306" Leaf="true">
1255+
<Str Cat="Text">
1256+
<Val><![CDATA[Add `extends` constraint.]]></Val>
1257+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1258+
<Val><![CDATA[Agregar restricción "extends".]]></Val>
1259+
</Tgt>
1260+
</Str>
1261+
<Disp Icon="Str" />
1262+
</Item>
1263+
<Item ItemId=";Add_extends_constraint_to_all_type_parameters_2212" ItemType="0" PsrId="306" Leaf="true">
1264+
<Str Cat="Text">
1265+
<Val><![CDATA[Add `extends` constraint to all type parameters]]></Val>
1266+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1267+
<Val><![CDATA[Agregar restricción "extends" a todos los parámetros de tipo]]></Val>
1268+
</Tgt>
1269+
</Str>
1270+
<Disp Icon="Str" />
1271+
</Item>
12541272
<Item ItemId=";Add_import_from_0_90057" ItemType="0" PsrId="306" Leaf="true">
12551273
<Str Cat="Text">
12561274
<Val><![CDATA[Add import from "{0}"]]></Val>
@@ -13842,11 +13860,11 @@
1384213860
</Str>
1384313861
<Disp Icon="Str" />
1384413862
</Item>
13845-
<Item ItemId=";This_type_parameter_probably_needs_an_extends_object_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
13863+
<Item ItemId=";This_type_parameter_might_need_an_extends_0_constraint_2208" ItemType="0" PsrId="306" Leaf="true">
1384613864
<Str Cat="Text">
13847-
<Val><![CDATA[This type parameter probably needs an `extends object` constraint.]]></Val>
13865+
<Val><![CDATA[This type parameter might need an `extends {0}` constraint.]]></Val>
1384813866
<Tgt Cat="Text" Stat="Loc" Orig="New">
13849-
<Val><![CDATA[Puede que este parámetro de tipo necesite una restricción “extends object”.]]></Val>
13867+
<Val><![CDATA[Este parámetro de tipo podría necesitar una restricción "extends {0}".]]></Val>
1385013868
</Tgt>
1385113869
</Str>
1385213870
<Disp Icon="Str" />
@@ -15276,6 +15294,15 @@
1527615294
</Str>
1527715295
<Disp Icon="Str" />
1527815296
</Item>
15297+
<Item ItemId=";We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843" ItemType="0" PsrId="306" Leaf="true">
15298+
<Str Cat="Text">
15299+
<Val><![CDATA[We can only write a type for '{0}' by adding a type for the entire parameter here.]]></Val>
15300+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15301+
<Val><![CDATA[Solo se puede escribir un tipo para '{0}' agregando aquí un tipo para todo el parámetro.]]></Val>
15302+
</Tgt>
15303+
</Str>
15304+
<Disp Icon="Str" />
15305+
</Item>
1527915306
<Item ItemId=";When_assigning_functions_check_to_ensure_parameters_and_the_return_values_are_subtype_compatible_6698" ItemType="0" PsrId="306" Leaf="true">
1528015307
<Str Cat="Text">
1528115308
<Val><![CDATA[When assigning functions, check to ensure parameters and the return values are subtype-compatible.]]></Val>
@@ -15630,6 +15657,15 @@
1563015657
</Str>
1563115658
<Disp Icon="Str" />
1563215659
</Item>
15660+
<Item ItemId=";_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842" ItemType="0" PsrId="306" Leaf="true">
15661+
<Str Cat="Text">
15662+
<Val><![CDATA['{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?]]></Val>
15663+
<Tgt Cat="Text" Stat="Loc" Orig="New">
15664+
<Val><![CDATA['{0}' es un cambio de nombre de '{1}' sin usar. ¿Quería usarlo como una anotación de tipo?]]></Val>
15665+
</Tgt>
15666+
</Str>
15667+
<Disp Icon="Str" />
15668+
</Item>
1563315669
<Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
1563415670
<Str Cat="Text">
1563515671
<Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>

0 commit comments

Comments
 (0)