Skip to content

Commit 7f4dcdc

Browse files
danvickdanvick
committed
Merge remote-tracking branch 'origin/master' into WingCH/master
# Conflicts: # packages/form_builder_validators/lib/localization/intl/messages_all.dart # packages/form_builder_validators/lib/localization/l10n.dart
2 parents e3fd220 + 3dfd03b commit 7f4dcdc

21 files changed

+194
-1
lines changed

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dart.flutterSdkPath": "/Users/jozes/development/flutter_2.8"
3+
}

‎packages/flutter_form_builder/lib/src/fields/form_builder_range_slider.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
109109
//From Super
110110
required String name,
111111
FormFieldValidator<RangeValues>? validator,
112-
RangeValues? initialValue,
112+
required RangeValues initialValue,
113113
InputDecoration decoration = const InputDecoration(),
114114
ValueChanged<RangeValues?>? onChanged,
115115
ValueTransformer<RangeValues?>? valueTransformer,

‎packages/form_builder_validators/lib/l10n/intl_sl.arb

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"@@last_modified": "2021-12-26T12:00:39.706877",
3+
"@@locale": "sl",
4+
"requiredErrorText": "Polje ne more biti prazno.",
5+
"@requiredErrorText": {
6+
"description": "Error Text for required field",
7+
"type": "text",
8+
"placeholders": {}
9+
},
10+
"minErrorText": "Vrednost mora biti večja ali enaka {min}.",
11+
"@minErrorText": {
12+
"description": "Error Text for required field",
13+
"type": "text",
14+
"placeholders": {
15+
"min": {}
16+
}
17+
},
18+
"minLengthErrorText": "Besedilo mora biti daljše ali enako {minLength} znakov",
19+
"@minLengthErrorText": {
20+
"description": "Error Text for required field",
21+
"type": "text",
22+
"placeholders": {
23+
"minLength": {}
24+
}
25+
},
26+
"maxErrorText": "Vrednost ne sme presegati {max}",
27+
"@maxErrorText": {
28+
"description": "Error Text for required field",
29+
"type": "text",
30+
"placeholders": {
31+
"max": {}
32+
}
33+
},
34+
"maxLengthErrorText": "Besedilo mora biti krajše ali enako {maxLength} znakov",
35+
"@maxLengthErrorText": {
36+
"description": "Error Text for required field",
37+
"type": "text",
38+
"placeholders": {
39+
"maxLength": {}
40+
}
41+
},
42+
"emailErrorText": "Vnesite veljaven e-mail naslov.",
43+
"@emailErrorText": {
44+
"description": "Error Text for email field",
45+
"type": "text",
46+
"placeholders": {}
47+
},
48+
"integerErrorText": "Vnesite celo število.",
49+
"@integerErrorText": {
50+
"description": "Error Text for integer validator",
51+
"type": "text",
52+
"placeholders": {}
53+
},
54+
"equalErrorText": "Vrednost mora biti enaka {value}.",
55+
"@equalErrorText": {
56+
"description": "Error Text for equal validator",
57+
"type": "text",
58+
"placeholders": {
59+
"value": {}
60+
}
61+
},
62+
"notEqualErrorText": "Vrednost ne sme biti večja kot {value}.",
63+
"@notEqualErrorText": {
64+
"description": "Error Text for not-equal validator",
65+
"type": "text",
66+
"placeholders": {
67+
"value": {}
68+
}
69+
},
70+
"urlErrorText": "Vnesite veljaven URL naslov.",
71+
"@urlErrorText": {
72+
"description": "Error Text for URL field",
73+
"type": "text",
74+
"placeholders": {}
75+
},
76+
"matchErrorText": "Vrednost ne ustreza predpisanemu vzorcu.",
77+
"@matchErrorText": {
78+
"description": "Error Text for pattern field",
79+
"type": "text",
80+
"placeholders": {}
81+
},
82+
"numericErrorText": "Vrednost polja mora biti numerična.",
83+
"@numericErrorText": {
84+
"description": "Error Text for numeric field",
85+
"type": "text",
86+
"placeholders": {}
87+
},
88+
"creditCardErrorText": "Vnesite veljavno številko kreditne kartice.",
89+
"@creditCardErrorText": {
90+
"description": "Error Text for credit card field",
91+
"type": "text",
92+
"placeholders": {}
93+
},
94+
"ipErrorText": "Vnesite IP naslov.",
95+
"@ipErrorText": {
96+
"description": "Error Text for IP address field",
97+
"type": "text",
98+
"placeholders": {}
99+
},
100+
"dateStringErrorText": "Vnesite veljaven datum.",
101+
"@dateStringErrorText": {
102+
"description": "Error Text for date string field",
103+
"type": "text",
104+
"placeholders": {}
105+
}
106+
}

‎packages/form_builder_validators/lib/localization/intl/messages_all.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import 'messages_messages.dart' as messages_messages;
3030
import 'messages_pl.dart' as messages_pl;
3131
import 'messages_pt.dart' as messages_pt;
3232
import 'messages_sk.dart' as messages_sk;
33+
import 'messages_sl.dart' as messages_sl;
3334
import 'messages_zh_Hans.dart' as messages_zh_hans;
3435
import 'messages_zh_Hant.dart' as messages_zh_hant;
3536

@@ -50,6 +51,7 @@ Map<String, LibraryLoader> _deferredLibraries = {
5051
'pl': () => new Future.value(null),
5152
'pt': () => new Future.value(null),
5253
'sk': () => new Future.value(null),
54+
'sl': () => new Future.value(null),
5355
'zh_Hans': () => new Future.value(null),
5456
'zh_Hant': () => new Future.value(null),
5557
};
@@ -86,6 +88,8 @@ MessageLookupByLibrary? _findExact(String localeName) {
8688
return messages_pt.messages;
8789
case 'sk':
8890
return messages_sk.messages;
91+
case 'sl':
92+
return messages_sl.messages;
8993
case 'zh_Hans':
9094
return messages_zh_hans.messages;
9195
case 'zh_Hant':

‎packages/form_builder_validators/lib/localization/intl/messages_ar.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
99
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
1010
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
1112

1213
import 'package:intl/intl.dart';
1314
import 'package:intl/message_lookup_by_library.dart';

‎packages/form_builder_validators/lib/localization/intl/messages_de.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
99
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
1010
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
1112

1213
import 'package:intl/intl.dart';
1314
import 'package:intl/message_lookup_by_library.dart';

‎packages/form_builder_validators/lib/localization/intl/messages_en.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
99
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
1010
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
1112

1213
import 'package:intl/intl.dart';
1314
import 'package:intl/message_lookup_by_library.dart';

‎packages/form_builder_validators/lib/localization/intl/messages_es.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
99
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
1010
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
1112

1213
import 'package:intl/intl.dart';
1314
import 'package:intl/message_lookup_by_library.dart';

‎packages/form_builder_validators/lib/localization/intl/messages_fa.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
99
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
1010
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
1112

1213
import 'package:intl/intl.dart';
1314
import 'package:intl/message_lookup_by_library.dart';

‎packages/form_builder_validators/lib/localization/intl/messages_fr.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
99
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
1010
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
1112

1213
import 'package:intl/intl.dart';
1314
import 'package:intl/message_lookup_by_library.dart';

0 commit comments

Comments
 (0)