diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9b54ee7e..35dfc4dc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1116,17 +1116,17 @@ en:
user_created: User created.
you_have_to_reset_your_password: You have to reset your password
will_paginate:
- next_label: След →
+ next_label: Next →
page_entries_info:
- multi_page: Отображено %{model} %{from} - %{to} из %{count}
- multi_page_html: Отображено %{model} %{from} - %{to} из %{count}
+ multi_page: Displaying %{model} %{from} - %{to} of %{count} in total
+ multi_page_html: Displaying %{model} %{from} - %{to} of %{count} in total
single_page:
- one: Отображен 1 %{model}
- other: Отображены все %{count} %{model}
- zero: "%{model} не найдено"
+ one: Displaying 1 %{model}
+ other: Displaying all %{count} %{model}
+ zero: No %{model} found
single_page_html:
- one: Отображен 1 %{model}
- other: Отображены все %{count} %{model}
- zero: "%{model} не найдено"
+ one: Displaying 1 %{model}
+ other: Displaying all %{count} %{model}
+ zero: No %{model} found
page_gap: "…"
- previous_label: "← Пред"
+ previous_label: "← Previous"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index bbe96044..41a5008b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1116,17 +1116,17 @@ fi:
user_created: User created.
you_have_to_reset_your_password: You have to reset your password
will_paginate:
- next_label: След →
+ next_label: Seuraava →
page_entries_info:
- multi_page: Отображено %{model} %{from} - %{to} из %{count}
- multi_page_html: Отображено %{model} %{from} - %{to} из %{count}
+ multi_page: Näytetään %{model} %{from} - %{to} yhtensä %{count} tietueesta
+ multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta
single_page:
- one: Отображен 1 %{model}
- other: Отображены все %{count} %{model}
- zero: "%{model} не найдено"
+ one: Näytetään 1 %{model}
+ other: Näytetään kaikki %{count} %{model}
+ zero: "%{model} ei löytynyt"
single_page_html:
- one: Отображен 1 %{model}
- other: Отображены все %{count} %{model}
- zero: "%{model} не найдено"
+ none: Näytetään 1 %{model}
+ other: Näytetään kaikki %{count} %{model}
+ zero: "%{model} ei löytynyt"
page_gap: "…"
- previous_label: "← Пред"
+ previous_label: "← Edellinen"
diff --git a/lib/is_taggable.rb b/lib/is_taggable.rb
index 1c96a0c3..47457383 100644
--- a/lib/is_taggable.rb
+++ b/lib/is_taggable.rb
@@ -38,7 +38,7 @@ module IsTaggable
end
def has_tag?(tag_name)
- return tags.any? {|tag| tag.name == tag_name}
+ return tags.any? { |tag| tag.name == tag_name }
end
# Add tags to self. Accepts a string of tagnames, an array of tagnames, or an array of Tags.
@@ -62,7 +62,7 @@ module IsTaggable
# Removes tags from self. Accepts a string of tagnames, an array of tagnames, or an array of Tags.
def _remove_tags(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
def get_tag_name_from_item(item)