Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix paginate locale and a few small style issues

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-10-27 18:27:41 +02:00
parent c1dbba5f11
commit d30138ee10
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config/locales/en.yml
View file

@ -1116,17 +1116,17 @@ en:
user_created: User created. user_created: User created.
you_have_to_reset_your_password: You have to reset your password you_have_to_reset_your_password: You have to reset your password
will_paginate: will_paginate:
next_label: След → next_label: Next →
page_entries_info: page_entries_info:
multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page: Displaying %{model} %{from} - %{to} of %{count} in total
multi_page_html: Отображено %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> из <b>%{count}</b> multi_page_html: Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> in total
single_page: single_page:
one: Отображен 1 %{model} one: Displaying 1 %{model}
other: Отображены все %{count} %{model} other: Displaying all %{count} %{model}
zero: "%{model} не найдено" zero: No %{model} found
single_page_html: single_page_html:
one: Отображен <b>1</b> %{model} one: Displaying <b>1</b> %{model}
other: Отображены <b>все&nbsp;%{count}</b> %{model} other: Displaying <b>all&nbsp;%{count}</b> %{model}
zero: "%{model} не найдено" zero: No %{model} found
page_gap: "&hellip;" page_gap: "&hellip;"
previous_label: "&#8592; Пред" previous_label: "&#8592; Previous"

20
config/locales/fi.yml
View file

@ -1116,17 +1116,17 @@ fi:
user_created: User created. user_created: User created.
you_have_to_reset_your_password: You have to reset your password you_have_to_reset_your_password: You have to reset your password
will_paginate: will_paginate:
next_label: След &#8594; next_label: Seuraava &#8594;
page_entries_info: page_entries_info:
multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page: Näytetään %{model} %{from} - %{to} yhtensä %{count} tietueesta
multi_page_html: Отображено %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> из <b>%{count}</b> multi_page_html: Näytetään %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> yhteensä <b>%{count}</b> tietueesta
single_page: single_page:
one: Отображен 1 %{model} one: Näytetään 1 %{model}
other: Отображены все %{count} %{model} other: Näytetään kaikki %{count} %{model}
zero: "%{model} не найдено" zero: "%{model} ei löytynyt"
single_page_html: single_page_html:
one: Отображен <b>1</b> %{model} none: Näytetään <b>1</b> %{model}
other: Отображены <b>все&nbsp;%{count}</b> %{model} other: Näytetään <b>kaikki&nbsp;%{count}</b> %{model}
zero: "%{model} не найдено" zero: "%{model} ei löytynyt"
page_gap: "&hellip;" page_gap: "&hellip;"
previous_label: "&#8592; Пред" previous_label: "&#8592; Edellinen"

4
lib/is_taggable.rb
View file

@ -38,7 +38,7 @@ module IsTaggable
end end
def has_tag?(tag_name) def has_tag?(tag_name)
return tags.any? {|tag| tag.name == tag_name} return tags.any? { |tag| tag.name == tag_name }
end end
# Add tags to <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, or an array of Tags. # Add tags to <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, or an array of Tags.
@ -62,7 +62,7 @@ module IsTaggable
# Removes tags from <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, or an array of Tags. # Removes tags from <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, or an array of Tags.
def _remove_tags(outgoing) def _remove_tags(outgoing)
outgoing = tag_cast_to_string(outgoing) outgoing = tag_cast_to_string(outgoing)
tags.destroy(*(self.user.tags.select{|tag| outgoing.include? tag.name})) tags.destroy(*(self.user.tags.select { |tag| outgoing.include? tag.name }))
end end
def get_tag_name_from_item(item) def get_tag_name_from_item(item)