about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/helpers/settings_helper.rb1
-rw-r--r--config/application.rb1
-rw-r--r--config/locales/devise.it.yml (renamed from devise.it.yml)2
-rw-r--r--config/locales/doorkeeper.it.yml (renamed from doorkeeper.it.yml)2
-rw-r--r--config/locales/it.yml (renamed from it.yml)0
-rw-r--r--config/locales/simple_form.it.yml (renamed from simple_form.it.yml)2
6 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 212f88c39..66d19e331 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -7,6 +7,7 @@ module SettingsHelper
     es: 'Español',
     eo: 'Esperanto',
     fr: 'Français',
+    it: 'Italiano'
     hu: 'Magyar',
     no: 'Norsk',
     pt: 'Português',
diff --git a/config/application.rb b/config/application.rb
index 1383d45a5..959385802 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,6 +33,7 @@ module Mastodon
       :es,
       :fi,
       :fr,
+      :it,
       :hu,
       :ja,
       :no,
diff --git a/devise.it.yml b/config/locales/devise.it.yml
index 813ccaba4..801288a1e 100644
--- a/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -58,4 +58,4 @@ it:
       not_locked: non era stato bloccato
       not_saved:
         one: '1 errore ha impedito che %{resource} venisse salvato:'
-        other: "%{count} errori hanno impedito che %{resource} venisse salvato:"
\ No newline at end of file
+        other: "%{count} errori hanno impedito che %{resource} venisse salvato:"
diff --git a/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 2f9b91513..4b5e463b0 100644
--- a/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -110,4 +110,4 @@ it:
     scopes:
       follow: seguire, bloccare, sbloccare e smettere di seguire account
       read: leggere le informazioni del tuo account
-      write: pubblicare post in tua vece
\ No newline at end of file
+      write: pubblicare post in tua vece
diff --git a/it.yml b/config/locales/it.yml
index 453de87a5..453de87a5 100644
--- a/it.yml
+++ b/config/locales/it.yml
diff --git a/simple_form.it.yml b/config/locales/simple_form.it.yml
index 1c5026e3d..afdc83860 100644
--- a/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -44,4 +44,4 @@ it:
     required:
       mark: "*"
       text: richiesto
-    'yes': 'Sì'
\ No newline at end of file
+    'yes': 'Sì'