Skip to content

Commit 3afe471

Browse files
committed
Fix locale_key error
1 parent 3d1e875 commit 3afe471

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

autoload/i18n_rails.vim

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ func! i18n_rails#translation(has_selection) abort
3131

3232
let l:translation = s:translation(l:locale_file, l:locale_key)
3333
if s:is_empty(l:translation)
34-
call s:show_error(s:errors_messages.translation, { 'locale_key': l:locale_key })
35-
else
36-
echo l:translation
34+
call s:show_error(s:errors_messages.translation, { 'locale_key': l:locale_key }) | return
3735
endif
36+
37+
echo l:translation
3838
endfunc
3939

4040
func! i18n_rails#translations(has_selection) abort
@@ -50,12 +50,12 @@ func! i18n_rails#translations(has_selection) abort
5050

5151
let l:translations = s:translations(l:locale_key)
5252
if s:is_empty(l:translations)
53-
call s:show_error(s:errors_messages.translation, { 'locale_key': l:locale_key })
54-
else
55-
call setloclist(0, l:translations, 'r')
56-
silent! exec 'lopen'
57-
call s:apply_mappings()
58-
endif
53+
call s:show_error(s:errors_messages.translation, { 'locale_key': l:locale_key }) | return
54+
end
55+
56+
call setloclist(0, l:translations, 'r')
57+
silent! exec 'lopen'
58+
call s:apply_mappings()
5959
endfunc
6060

6161
func! i18n_rails#open(has_selection, mods) abort
@@ -76,11 +76,11 @@ func! i18n_rails#open(has_selection, mods) abort
7676

7777
let l:line_number = s:line_number(l:locale_file, l:locale_key)
7878
if s:is_empty(l:line_number)
79-
call s:show_error(s:errors_messages.translation, { 'locale_key': l:locale_key })
80-
else
81-
call s:open_locale(l:locale_file, a:mods)
82-
call s:goto_line(l:line_number)
79+
call s:show_error(s:errors_messages.translation, { 'locale_key': l:locale_key }) | return
8380
endif
81+
82+
call s:open_locale(l:locale_file, a:mods)
83+
call s:goto_line(l:line_number)
8484
endfunc
8585

8686
func! s:translation(locale_file, locale_key) abort
@@ -179,10 +179,10 @@ func! s:locale_key(has_selection) abort
179179
if s:is_empty(a:has_selection)
180180
let l:locale_key = input('Locale key: ')
181181
redraw
182-
return l:locale_file
183-
else
184-
return s:selection()
182+
return l:locale_key
185183
end
184+
185+
return s:selection()
186186
endfunc
187187

188188
func! s:full_locale_key(locale_file, locale_key) abort

test/fixtures/config/locales/ru-RU.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
de-DE:
1+
ru-RU:
22
user:
33
first_name: Имя
44
last_name: Фамилия

0 commit comments

Comments
 (0)