Merge pull request #354 from blackcandy-org/locales

Reorganize i18n file content

app/controllers/albums_controller.rb

@@ -20,7 +20,7 @@ def show
 
   def update
     if @album.update(album_params)
-      flash[:success] = t("success.update")
+      flash[:success] = t("notice.updated")
     else
       flash_errors_message(@album)
     end

app/controllers/application_controller.rb

@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   include Pagy::Backend
   include SessionsHelper
 
-  helper_method :native_app?, :need_transcode?, :render_flash, :mobile?
+  helper_method :native_app?, :need_transcode?, :render_flash, :mobile?, :dialog?
 
   before_action :find_current_session
   before_action :find_current_request_details
@@ -83,6 +83,10 @@ def mobile?
     browser.device.mobile?
   end
 
+  def dialog?
+    is_a? Dialog::DialogController
+  end
+
   private
 
   def find_current_session

app/controllers/artists_controller.rb

@@ -17,7 +17,7 @@ def show
 
   def update
     if @artist.update(artist_params)
-      flash[:success] = t("success.update")
+      flash[:success] = t("notice.updated")
     else
       flash_errors_message(@artist)
     end

app/controllers/current_playlist/songs_controller.rb

@@ -19,7 +19,7 @@ def create
       @playlist.playlists_songs.create(song_id: @song.id, position: @current_song_position + 1)
     end
 
-    flash.now[:success] = t("success.add_to_playlist")
+    flash.now[:success] = t("notice.added_to_playlist")
 
     redirect_to action: "index", should_play_all: params[:should_play] if @playlist.songs.count == 1
   rescue ActiveRecord::RecordNotUnique

app/controllers/playlists/songs_controller.rb

@@ -13,7 +13,7 @@ def create
     @song = Song.find(params[:song_id])
     @playlist.songs.push(@song)
 
-    flash[:success] = t("success.add_to_playlist")
+    flash[:success] = t("notice.added_to_playlist")
   rescue ActiveRecord::RecordNotUnique
     flash[:error] = t("error.already_in_playlist")
   ensure
@@ -22,7 +22,7 @@ def create
 
   def destroy
     @playlist.songs.destroy(@song)
-    flash.now[:success] = t("success.delete_from_playlist")
+    flash.now[:success] = t("notice.deleted_from_playlist")
 
     # for refresh playlist content, when remove last song from playlist
     redirect_to action: "index" if @playlist.songs.empty?

app/controllers/playlists_controller.rb

@@ -12,7 +12,7 @@ def create
     @playlist = Current.user.playlists.new playlist_params
 
     if @playlist.save
-      flash[:success] = t("success.create")
+      flash[:success] = t("notice.created")
     else
       flash_errors_message(@playlist)
     end
@@ -22,7 +22,7 @@ def create
 
   def update
     if @playlist.update(playlist_params)
-      flash[:success] = t("success.update")
+      flash[:success] = t("notice.updated")
     else
       flash_errors_message(@playlist)
     end

app/controllers/settings_controller.rb

@@ -10,7 +10,7 @@ def update
     setting = Setting.instance
 
     if setting.update(setting_params)
-      flash.now[:success] = t("success.update")
+      flash.now[:success] = t("notice.updated")
     else
       flash_errors_message(setting, now: true)
     end

app/controllers/users/settings_controller.rb

@@ -6,7 +6,7 @@ class Users::SettingsController < ApplicationController
 
   def update
     return unless @user.update(user_setting_params)
-    flash.now[:success] = t("success.update")
+    flash.now[:success] = t("notice.updated")
   end
 
   private

app/controllers/users_controller.rb

@@ -20,7 +20,7 @@ def create
     @user = User.new user_params
 
     if @user.save
-      flash[:success] = t("success.create")
+      flash[:success] = t("notice.created")
       redirect_to users_path
     else
       flash_errors_message(@user, now: true)
@@ -29,7 +29,7 @@ def create
 
   def update
     if @user.update(user_params)
-      flash.now[:success] = t("success.update")
+      flash.now[:success] = t("notice.updated")
     else
       flash_errors_message(@user, now: true)
     end
@@ -40,7 +40,7 @@ def destroy
     raise BlackCandy::Forbidden if @user == Current.user
 
     @user.destroy
-    flash.now[:success] = t("success.delete")
+    flash.now[:success] = t("notice.deleted")
   end
 
   private

app/helpers/application_helper.rb

@@ -78,7 +78,7 @@ def is_active?(controller: "", path: "")
 
   def page_title_tag(title)
     title_suffix = " - #{t(:app_name)}"
-    title = "#{title}#{title_suffix unless native_app?}"
+    title = "#{title}#{title_suffix unless native_app? || dialog?}"
 
     content_for(:title, title)
   end

app/views/albums/_filters.html.erb

@@ -10,7 +10,7 @@
 <details class='c-dropdown u-mr-small' data-controller="dropdown">
   <summary class='c-button c-button--outline c-button--small'>
     <span class='o-flex o-flex--align-center'>
-      <%= t("label.genre") %>
+      <%= t("field.genre") %>
       <%= icon_tag "expand-more" %>
     </span>
   </summary>
@@ -26,7 +26,7 @@
 <details class='c-dropdown u-mr-small' data-controller="dropdown">
   <summary class='c-button c-button--outline c-button--small'>
     <span class='o-flex o-flex--align-center'>
-      <%= t("label.year") %>
+      <%= t("field.year") %>
       <%= icon_tag "expand-more" %>
     </span>
   </summary>

app/views/albums/show.html.erb

@@ -13,7 +13,7 @@
       </div>
       <div class='u-mt-large'>
         <%= button_to(
-              t("label.play_all"),
+              t("button.play_all"),
               current_playlist_album_path(@album),
               method: :put,
               form_class: "u-display-inline-block",
@@ -78,7 +78,7 @@
                       class: "c-dropdown__item"
                     ) %>
                 <%= button_to(
-                      t("label.play_next"),
+                      t("button.play_next"),
                       current_playlist_songs_path(song_id: song.id),
                       form_class: "c-dropdown__item",
                       form: {
@@ -90,7 +90,7 @@
                       }
                     ) %>
                 <%= button_to(
-                      t("label.play_last"),
+                      t("button.play_last"),
                       current_playlist_songs_path(song_id: song.id, location: "last"),
                       form_class: "c-dropdown__item",
                       form: {

app/views/current_playlist/songs/_song.html.erb

@@ -27,7 +27,7 @@
       <div class='c-dropdown__menu' data-dropdown-target="menu">
         <%= link_to t("label.add_to_playlist"), dialog_playlists_path(song_id: song.id, referer_url: current_url), data: {"turbo-frame" => ("turbo-dialog" unless native_app?)}, class: "c-dropdown__item" %>
 
-        <%= button_to t("label.delete"), current_playlist_song_path(song), method: :delete, form_class: "c-dropdown__item", form: {data: {"turbo-frame" => "turbo-playlist"}} %>
+        <%= button_to t("button.delete"), current_playlist_song_path(song), method: :delete, form_class: "c-dropdown__item", form: {data: {"turbo-frame" => "turbo-playlist"}} %>
       </div>
     </details>
   </div>

app/views/current_playlist/songs/index.html.erb

@@ -13,7 +13,7 @@
       <details class='c-dropdown' data-controller='dropdown' data-test-id='playlist_menu'>
         <summary class="c-button c-button--icon"><%= icon_tag "more-vertical", title: t("label.more") %></summary>
         <div class='c-dropdown__menu' data-dropdown-target="menu">
-          <%= button_to t("label.clear"), current_playlist_songs_path, method: :delete, form_class: "c-dropdown__item" %>
+          <%= button_to t("button.clear"), current_playlist_songs_path, method: :delete, form_class: "c-dropdown__item" %>
         </div>
       </details>
     </div>

app/views/dialog/albums/edit.html.erb

@@ -2,10 +2,10 @@
 
 <%= form_with model: @album, data: {"turbo-frame" => "_top", "turbo-action" => ("replace" if native_app?), "test-id" => "album_edit_form"}, class: "c-form" do |form| %>
   <div class='c-form__field'>
-    <%= form.label :cover_image, t("label.album_cover") %>
+    <%= form.label :cover_image, t("field.album_cover") %>
     <%= form.file_field :cover_image, accept: "image/png, image/jpeg", class: "c-input" %>
   </div>
   <div class='c-form__field c-form__field--submit'>
-    <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width" %>
+    <%= form.submit t("button.save"), class: "c-button c-button--primary c-button--full-width" %>
   </div>
 <% end %>

app/views/dialog/artists/edit.html.erb

@@ -2,10 +2,10 @@
 
 <%= form_with model: @artist, data: {"turbo-frame" => "_top", "turbo-action" => ("replace" if native_app?), "test-id" => "artist_edit_form"}, class: "c-form" do |form| %>
   <div class='c-form__field'>
-    <%= form.label :cover_image, t("label.artist_cover") %>
+    <%= form.label :cover_image, t("field.artist_cover") %>
     <%= form.file_field :cover_image, accept: "image/png, image/jpeg", class: "c-input" %>
   </div>
   <div class='c-form__field c-form__field--submit'>
-    <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width" %>
+    <%= form.submit t("button.save"), class: "c-button c-button--primary c-button--full-width" %>
   </div>
 <% end %>

app/views/dialog/playlists/edit.html.erb

@@ -10,11 +10,11 @@
       }
     ) do |form| %>
   <div class='c-form__field'>
-    <%= form.label :name, t("label.name") %>
+    <%= form.label :name, t("field.name") %>
     <%= form.text_field :name, class: "c-input" %>
   </div>
 
   <div class='c-form__field c-form__field--submit'>
-    <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width" %>
+    <%= form.submit t("button.save"), class: "c-button c-button--primary c-button--full-width" %>
   </div>
 <% end %>

app/views/dialog/playlists/new.html.erb

@@ -2,11 +2,11 @@
 
 <%= form_with model: @playlist, class: "c-form", data: {"turbo-frame" => "_top", "turbo-action" => ("replace" if native_app?)} do |form| %>
   <div class='c-form__field'>
-    <%= form.label :name, t("label.name") %>
+    <%= form.label :name, t("field.name") %>
     <%= form.text_field :name, class: "c-input" %>
   </div>
 
   <div class='c-form__field c-form__field--submit'>
-    <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width" %>
+    <%= form.submit t("button.save"), class: "c-button c-button--primary c-button--full-width" %>
   </div>
 <% end %>

app/views/favorite_playlist/songs/index.html.erb

@@ -12,7 +12,7 @@
         <div class='u-mt-large'>
           <% unless @songs.blank? %>
             <%= button_to(
-                  t("label.play_all"),
+                  t("button.play_all"),
                   current_playlist_playlist_path(@playlist),
                   method: :put,
                   class: "c-button c-button--primary",
@@ -27,7 +27,7 @@
                     }
                   }
                 ) %>
-            <%= button_to t("label.clear"), favorite_playlist_songs_path, class: "c-button c-button--secondary", form_class: "u-display-inline-block", method: :delete %>
+            <%= button_to t("button.clear"), favorite_playlist_songs_path, class: "c-button c-button--secondary", form_class: "u-display-inline-block", method: :delete %>
           <% end %>
         </div>
       </div>

app/views/media_syncing/_button.html.erb

@@ -1,20 +1,20 @@
 <div id="turbo-media-syncing-button">
   <% if syncing %>
     <%= button_to(
-          t("label.syncing"),
+          t("button.syncing"),
           false,
           class: "c-button c-button--secondary",
           data: {"test-id" => "media_sync_button"},
           disabled: true
         ) %>
   <% else %>
     <%= button_to(
-        t("label.sync"),
+        t("button.sync"),
         media_syncing_path,
         class: "c-button c-button--secondary",
         data: {
           "test-id" => "media_sync_button",
-          "turbo-submits-with" => t("label.syncing")
+          "turbo-submits-with" => t("button.syncing")
         }
       ) %>
   <% end %>

app/views/media_syncing/_syncing.turbo_stream.erb

@@ -1,5 +1,5 @@
 <%= turbo_stream.replace "turbo-media-syncing-button", partial: "media_syncing/button", locals: {syncing: syncing} %>
 
 <% unless syncing %>
-  <%= render_flash(message: t("text.sync_completed")) %>
+  <%= render_flash(message: t("notice.sync_completed")) %>
 <% end %>

app/views/playlists/songs/_song.html.erb

@@ -34,7 +34,7 @@
               class: "c-dropdown__item"
             ) %>
         <%= button_to(
-              t("label.play_next"),
+              t("button.play_next"),
               current_playlist_songs_path(song_id: song.id),
               form_class: "c-dropdown__item",
               form: {
@@ -46,7 +46,7 @@
               }
             ) %>
         <%= button_to(
-              t("label.play_last"),
+              t("button.play_last"),
               current_playlist_songs_path(song_id: song.id, location: "last"),
               form_class: "c-dropdown__item",
               form: {
@@ -58,7 +58,7 @@
               }
             ) %>
         <%= button_to(
-              t("label.delete"),
+              t("button.delete"),
               playlist_song_path(playlist, song),
               method: :delete,
               form_class: "c-dropdown__item"

app/views/playlists/songs/index.html.erb

@@ -14,7 +14,7 @@
         <div class='u-mt-large'>
           <% unless @songs.blank? %>
             <%= button_to(
-                  t("label.play_all"),
+                  t("button.play_all"),
                   current_playlist_playlist_path(@playlist),
                   method: :put,
                   class: "c-button c-button--primary",
@@ -38,9 +38,9 @@
             </summary>
             <div class='c-dropdown__menu c-dropdown__menu--right' data-dropdown-target="menu">
               <% unless @songs.blank? %>
-                <%= button_to t("label.clear"), playlist_songs_path(@playlist), method: :delete, form_class: "c-dropdown__item" %>
+                <%= button_to t("button.clear"), playlist_songs_path(@playlist), method: :delete, form_class: "c-dropdown__item" %>
               <% end %>
-              <%= button_to t("label.delete"), playlist_path(@playlist), method: :delete, form_class: "c-dropdown__item" %>
+              <%= button_to t("button.delete"), playlist_path(@playlist), method: :delete, form_class: "c-dropdown__item" %>
             </div>
           </details>
         </div>

app/views/search/albums/index.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t("text.search_results", query: params[:query]) %></h1>
+<h1><%= t("label.search_results_for", query: params[:query]) %></h1>
 <h2><%= t("label.albums") %></h2>
 <div class='o-grid o-grid--shelf u-mb-large'>
   <%= render partial: "albums/album", collection: @albums %>

app/views/search/artists/index.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t("text.search_results", query: params[:query]) %></h1>
+<h1><%= t("label.search_results_for", query: params[:query]) %></h1>
 <h2><%= t("label.artists") %></h2>
 <div class='o-grid o-grid--shelf u-mb-large'>
   <%= render partial: "artists/artist", collection: @artists %>

app/views/search/index.html.erb

@@ -1,7 +1,7 @@
 <% page_title_tag t("label.search_results") %>
 
 <% if [@albums, @artists, @songs, @playlists].any?(&:present?) %>
-  <h1><%= t("text.search_results", query: params[:query]) %></h1>
+  <h1><%= t("label.search_results_for", query: params[:query]) %></h1>
 
   <% if @albums.present? %>
     <div class='o-flex o-flex--justify-between o-flex--align-center u-mb-medium'>
@@ -53,5 +53,5 @@
     <%= render partial: "search/songs/table", locals: {songs: @songs} %>
   <% end %>
 <% else %>
-  <h1><%= t("text.no_search_results", query: params[:query]) %></h1>
+  <h1><%= t("label.no_search_results", query: params[:query]) %></h1>
 <% end %>

app/views/search/playlists/index.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t("text.search_results", query: params[:query]) %></h1>
+<h1><%= t("label.search_results_for", query: params[:query]) %></h1>
 <h2><%= t("label.playlists") %></h2>
 
 <div class='o-grid o-grid--list'>

app/views/search/songs/_table.html.erb

@@ -1,7 +1,7 @@
 <div role='table' class='c-table' data-controller='playlist-songs playlist-songs-bridge' cols-at-medium='3' cols-at-small='2'>
   <div role='rowgroup'>
     <div role='row'>
-      <div role='columnheader'><%= t("label.name") %></div>
+      <div role='columnheader'><%= t("field.name") %></div>
       <div role='columnheader' class='u-display-none@medium'><%= t("label.artist") %></div>
       <div role='columnheader' class='u-display-none@medium'><%= t("label.album") %></div>
       <div role='columnheader' class='u-display-none@small'><%= t("label.duration") %></div>

app/views/search/songs/index.html.erb

@@ -1,3 +1,3 @@
-<h1><%= t("text.search_results", query: params[:query]) %></h1>
+<h1><%= t("label.search_results_for", query: params[:query]) %></h1>
 <h2><%= t("label.songs") %></h2>
 <%= render partial: "search/songs/table", locals: {songs: @songs} %>