File tree 4 files changed +9
-5
lines changed 4 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ function create(context: RuleContext): RuleListener {
63
63
upper ?: KeyStack
64
64
}
65
65
let keyStack : KeyStack = {
66
- inLocale : targetLocaleMessage . localeKey === 'file'
66
+ inLocale : targetLocaleMessage . isResolvedLocaleByFileName ( )
67
67
}
68
68
return {
69
69
JSONProperty ( node : JSONAST . JSONProperty ) {
@@ -110,7 +110,7 @@ function create(context: RuleContext): RuleListener {
110
110
upper ?: KeyStack
111
111
}
112
112
let keyStack : KeyStack = {
113
- inLocale : targetLocaleMessage . localeKey === 'file'
113
+ inLocale : targetLocaleMessage . isResolvedLocaleByFileName ( )
114
114
}
115
115
function withinKey ( node : YAMLAST . YAMLNode ) {
116
116
for ( const keyNode of yamlKeyNodes ) {
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ function create(context: RuleContext): RuleListener {
47
47
targetLocaleMessage : LocaleMessage ,
48
48
otherLocaleMessages : LocaleMessage [ ]
49
49
) : PathStack {
50
- if ( targetLocaleMessage . localeKey === 'file' ) {
50
+ if ( targetLocaleMessage . isResolvedLocaleByFileName ( ) ) {
51
51
const locale = targetLocaleMessage . locales [ 0 ]
52
52
return createInitLocalePathStack ( locale , otherLocaleMessages )
53
53
} else {
Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ function create(context: RuleContext): RuleListener {
115
115
} [ ]
116
116
}
117
117
let keyStack : KeyStack
118
- if ( targetLocaleMessage . localeKey === 'file' ) {
118
+ if ( targetLocaleMessage . isResolvedLocaleByFileName ( ) ) {
119
119
const locale = targetLocaleMessage . locales [ 0 ]
120
120
keyStack = {
121
121
locale,
Original file line number Diff line number Diff line change @@ -114,11 +114,15 @@ export abstract class LocaleMessage {
114
114
return ( this . _locales = [ ] )
115
115
}
116
116
117
+ isResolvedLocaleByFileName ( ) {
118
+ return this . localeKey === 'file' || this . localeKey === 'path'
119
+ }
120
+
117
121
/**
118
122
* Gets messages for the given locale.
119
123
*/
120
124
getMessagesFromLocale ( locale : string ) : I18nLocaleMessageDictionary {
121
- if ( this . localeKey === 'file' || this . localeKey === 'path' ) {
125
+ if ( this . isResolvedLocaleByFileName ( ) ) {
122
126
if ( ! this . locales . includes ( locale ) ) {
123
127
return { }
124
128
}
You can’t perform that action at this time.
0 commit comments