diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 84aa3d9c1..8cf47b7d1 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -22,9 +22,10 @@ class RepositoriesController < ApplicationController end def destroy - @repo = Repository.find(params[:id]) - flash[:success] = t('repositories.index.delete_flash', name: @repo.name) - @repo.destroy + @repository = Repository.find(params[:id]) + flash[:success] = t('repositories.index.delete_flash', + name: @repository.name) + @repository.destroy redirect_to :back end @@ -42,18 +43,18 @@ class RepositoriesController < ApplicationController end def update - @repo = Repository.find(params[:id]) - old_name = @repo.name - @repo.update_attributes(repository_params) + @repository = Repository.find(params[:id]) + old_name = @repository.name + @repository.update_attributes(repository_params) respond_to do |format| format.json do - if @repo.save + if @repository.save flash[:success] = t('repositories.index.rename_flash', - old_name: old_name, new_name: @repo.name) + old_name: old_name, new_name: @repository.name) render json: {}, status: :ok else - render json: @repo.errors, status: :unprocessable_entity + render json: @repository.errors, status: :unprocessable_entity end end end diff --git a/app/views/repositories/_rename_repository_modal.html.erb b/app/views/repositories/_rename_repository_modal.html.erb index c40493d4c..fbb73bc75 100644 --- a/app/views/repositories/_rename_repository_modal.html.erb +++ b/app/views/repositories/_rename_repository_modal.html.erb @@ -23,7 +23,7 @@ </div> </div> <div class="modal-footer"> - <%= f.submit t("repositories.index.modal_rename.copy"), class: "btn btn-primary" %> + <%= f.submit t("repositories.index.modal_rename.rename"), class: "btn btn-primary" %> <button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button> </div> </div> diff --git a/config/locales/en.yml b/config/locales/en.yml index d7cc85fae..ac085c98b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -174,7 +174,7 @@ en: title_html: "Rename repository <em>%{name}</em>" name: "New repository name" name_placeholder: "My repository" - copy: "Copy repository" + rename: "Rename repository" nav: breadcrumbs: repositories: "Repositories"