Skip to content

Commit 5e156da

Browse files
danvickdanvick
committed
Merge remote-tracking branch 'origin/master'
2 parents 964012f + cb33b5f commit 5e156da

File tree

7 files changed

+185
-3
lines changed

7 files changed

+185
-3
lines changed

‎packages/flutter_form_builder/lib/src/form_builder_field.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
133133

134134
@override
135135
void dispose() {
136-
_focusNode?.removeListener(_touchedHandler);
137-
_focusNode?.dispose();
136+
effectiveFocusNode.removeListener(_touchedHandler);
137+
effectiveFocusNode.dispose();
138138
_formBuilderState?.unregisterField(widget.name, this);
139139
super.dispose();
140140
}
@@ -155,7 +155,7 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
155155
}
156156

157157
void _touchedHandler() {
158-
if (_focusNode!.hasFocus && _touched == false) {
158+
if (effectiveFocusNode.hasFocus && _touched == false) {
159159
setState(() => _touched = true);
160160
}
161161
}

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

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"@@last_modified": "2021-11-04T12:24:27.938366",
3+
"@@locale": "ko",
4+
"requiredErrorText": "이 필드는 반드시 입력해야 합니다.",
5+
"@requiredErrorText": {
6+
"description": "Error Text for required validator",
7+
"type": "text",
8+
"placeholders": {}
9+
},
10+
"equalErrorText": "이 필드의 값은 반드시 {value}와 같아야 합니다.",
11+
"@equalErrorText": {
12+
"description": "Error Text for equal validator",
13+
"type": "text",
14+
"placeholders": {
15+
"value": {}
16+
}
17+
},
18+
"notEqualErrorText": "이 필드의 값은 반드시 {value}와 달라야 합니다.",
19+
"@notEqualErrorText": {
20+
"description": "Error Text for not-equal validator",
21+
"type": "text",
22+
"placeholders": {
23+
"value": {}
24+
}
25+
},
26+
"minErrorText": "이 필드의 값은 반드시 {min} 이상이어야 합니다.",
27+
"@minErrorText": {
28+
"description": "Error Text for required field",
29+
"type": "text",
30+
"placeholders": {
31+
"min": {}
32+
}
33+
},
34+
"minLengthErrorText": "이 필드는 반드시 {minLength}자 이상이어야 합니다.",
35+
"@minLengthErrorText": {
36+
"description": "Error Text for minLength validator",
37+
"type": "text",
38+
"placeholders": {
39+
"minLength": {}
40+
}
41+
},
42+
"maxErrorText": "이 필드의 값은 반드시 {max} 이하이어야 합니다.",
43+
"@maxErrorText": {
44+
"description": "Error Text for max validator",
45+
"type": "text",
46+
"placeholders": {
47+
"max": {}
48+
}
49+
},
50+
"maxLengthErrorText": "이 필드는 반드시 {maxLength}자 이하이어야 합니다.",
51+
"@maxLengthErrorText": {
52+
"description": "Error Text for required field",
53+
"type": "text",
54+
"placeholders": {
55+
"maxLength": {}
56+
}
57+
},
58+
"emailErrorText": "이메일 주소 형식이 올바르지 않습니다.",
59+
"@emailErrorText": {
60+
"description": "Error Text for email validator",
61+
"type": "text",
62+
"placeholders": {}
63+
},
64+
"urlErrorText": "URL 형식이 올바르지 않습니다.",
65+
"@urlErrorText": {
66+
"description": "Error Text for URL validator",
67+
"type": "text",
68+
"placeholders": {}
69+
},
70+
"matchErrorText": "필드의 값이 패턴과 맞지 않습니다.",
71+
"@matchErrorText": {
72+
"description": "Error Text for pattern validator",
73+
"type": "text",
74+
"placeholders": {}
75+
},
76+
"numericErrorText": "숫자만 입력 가능합니다.",
77+
"@numericErrorText": {
78+
"description": "Error Text for numeric validator",
79+
"type": "text",
80+
"placeholders": {}
81+
},
82+
"integerErrorText": "정수만 입력 가능합니다.",
83+
"@integerErrorText": {
84+
"description": "Error Text for integer validator",
85+
"type": "text",
86+
"placeholders": {}
87+
},
88+
"creditCardErrorText": "유효한 카드 번호를 입력해 주세요.",
89+
"@creditCardErrorText": {
90+
"description": "Error Text for credit card validator",
91+
"type": "text",
92+
"placeholders": {}
93+
},
94+
"ipErrorText": "유효한 IP를 입력해 주세요.",
95+
"@ipErrorText": {
96+
"description": "Error Text for IP address validator",
97+
"type": "text",
98+
"placeholders": {}
99+
},
100+
"dateStringErrorText": "날짜 형식이 올바르지 않습니다.",
101+
"@dateStringErrorText": {
102+
"description": "Error Text for date string validator",
103+
"type": "text",
104+
"placeholders": {}
105+
}
106+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
"value": {}
1515
}
1616
},
17+
"notEqualErrorText": "This field value must not be equal to {value}.",
18+
"@notEqualErrorText": {
19+
"description": "Error Text for not-equal validator",
20+
"type": "text",
21+
"placeholders": {
22+
"value": {}
23+
}
24+
},
1725
"minErrorText": "Value must be greater than or equal to {min}.",
1826
"@minErrorText": {
1927
"description": "Error Text for required field",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import 'messages_fr.dart' as messages_fr;
2424
import 'messages_hu.dart' as messages_hu;
2525
import 'messages_it.dart' as messages_it;
2626
import 'messages_ja.dart' as messages_ja;
27+
import 'messages_ko.dart' as messages_ko;
2728
import 'messages_messages.dart' as messages_messages;
2829
import 'messages_pl.dart' as messages_pl;
2930
import 'messages_pt.dart' as messages_pt;
@@ -40,6 +41,7 @@ Map<String, LibraryLoader> _deferredLibraries = {
4041
'hu': () => new Future.value(null),
4142
'it': () => new Future.value(null),
4243
'ja': () => new Future.value(null),
44+
'ko': () => new Future.value(null),
4345
'messages': () => new Future.value(null),
4446
'pl': () => new Future.value(null),
4547
'pt': () => new Future.value(null),
@@ -66,6 +68,8 @@ MessageLookupByLibrary? _findExact(String localeName) {
6668
return messages_it.messages;
6769
case 'ja':
6870
return messages_ja.messages;
71+
case 'ko':
72+
return messages_ko.messages;
6973
case 'messages':
7074
return messages_messages.messages;
7175
case 'pl':

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
2+
// This is a library that provides messages for a ko locale. All the
3+
// messages from the main program should be duplicated here with the same
4+
// function name.
5+
6+
// Ignore issues from commonly used lints in this file.
7+
// ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new
8+
// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
9+
// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
10+
// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
11+
12+
import 'package:intl/intl.dart';
13+
import 'package:intl/message_lookup_by_library.dart';
14+
15+
final messages = new MessageLookup();
16+
17+
typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
18+
19+
class MessageLookup extends MessageLookupByLibrary {
20+
String get localeName => 'ko';
21+
22+
static String m0(value) => "이 필드의 값은 반드시 ${value}와 같아야 합니다.";
23+
24+
static String m1(max) => "이 필드의 값은 반드시 ${max} 이하이어야 합니다.";
25+
26+
static String m2(maxLength) => "이 필드는 반드시 ${maxLength}자 이하이어야 합니다.";
27+
28+
static String m3(min) => "이 필드의 값은 반드시 ${min} 이상이어야 합니다.";
29+
30+
static String m4(minLength) => "이 필드는 반드시 ${minLength}자 이상이어야 합니다.";
31+
32+
static String m5(value) => "이 필드의 값은 반드시 ${value}와 달라야 합니다.";
33+
34+
final messages = _notInlinedMessages(_notInlinedMessages);
35+
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
36+
"creditCardErrorText":
37+
MessageLookupByLibrary.simpleMessage("유효한 카드 번호를 입력해 주세요."),
38+
"dateStringErrorText":
39+
MessageLookupByLibrary.simpleMessage("날짜 형식이 올바르지 않습니다."),
40+
"emailErrorText":
41+
MessageLookupByLibrary.simpleMessage("이메일 주소 형식이 올바르지 않습니다."),
42+
"equalErrorText": m0,
43+
"integerErrorText":
44+
MessageLookupByLibrary.simpleMessage("정수만 입력 가능합니다."),
45+
"ipErrorText": MessageLookupByLibrary.simpleMessage("유효한 IP를 입력해 주세요."),
46+
"matchErrorText":
47+
MessageLookupByLibrary.simpleMessage("필드의 값이 패턴과 맞지 않습니다."),
48+
"maxErrorText": m1,
49+
"maxLengthErrorText": m2,
50+
"minErrorText": m3,
51+
"minLengthErrorText": m4,
52+
"notEqualErrorText": m5,
53+
"numericErrorText":
54+
MessageLookupByLibrary.simpleMessage("숫자만 입력 가능합니다."),
55+
"requiredErrorText":
56+
MessageLookupByLibrary.simpleMessage("이 필드는 반드시 입력해야 합니다."),
57+
"urlErrorText":
58+
MessageLookupByLibrary.simpleMessage("URL 형식이 올바르지 않습니다.")
59+
};
60+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ class MessageLookup extends MessageLookupByLibrary {
3131
static String m4(minLength) =>
3232
"Value must have a length greater than or equal to ${minLength}";
3333

34+
static String m5(value) => "This field value must not be equal to ${value}.";
35+
3436
final messages = _notInlinedMessages(_notInlinedMessages);
3537
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
3638
"creditCardErrorText": MessageLookupByLibrary.simpleMessage(
@@ -50,6 +52,7 @@ class MessageLookup extends MessageLookupByLibrary {
5052
"maxLengthErrorText": m2,
5153
"minErrorText": m3,
5254
"minLengthErrorText": m4,
55+
"notEqualErrorText": m5,
5356
"numericErrorText":
5457
MessageLookupByLibrary.simpleMessage("Value must be numeric."),
5558
"requiredErrorText":

‎packages/form_builder_validators/lib/localization/l10n.dart

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)