Skip to content

Commit

Permalink
The Browse buttons have been renamed to Choose file
Browse files Browse the repository at this point in the history
  • Loading branch information
isimluk committed Aug 22, 2016
1 parent a309eb6 commit 72ecfd9
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 16 deletions.
Expand Up @@ -19,7 +19,7 @@ def upload_sysprep_file
end
else
@edit[:new][:sysprep_upload_text] = nil
msg = _("Use the Browse button to locate an Upload file")
msg = _("Use the Choose file button to locate an Upload file")
add_flash(msg, :error)
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/catalog_controller.rb
Expand Up @@ -441,7 +441,7 @@ def st_upload_image
end
else
identify_catalog(params[:id])
msg = _("Use the Browse button to locate a .png or .jpg image file")
msg = _("Use the Choose file button to locate a .png or .jpg image file")
err = true
end
params[:id] = x_build_node_id(@record) # Get the tree node id
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/miq_ae_customization_controller.rb
Expand Up @@ -46,7 +46,7 @@ def x_button

def upload_import_file
if params[:upload].nil? || params[:upload][:file].blank?
add_flash(_("Use the browse button to locate an import file"), :warning)
add_flash(_("Use the Choose file button to locate an import file"), :warning)
else
begin
import_file = dialog_import_service.store_for_import(params[:upload][:file].read)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/miq_ae_tools_controller.rb
Expand Up @@ -178,7 +178,7 @@ def upload_import_file
upload_file = params.fetch_path(:upload, :file)

if upload_file.blank?
add_flash(_("Use the browse button to locate an import file"), :warning)
add_flash(_("Use the Choose file button to locate an import file"), :warning)
else
import_file_upload_id = automate_import_service.store_for_import(upload_file.read)
add_flash(_("Import file was uploaded successfully"), :success)
Expand Down Expand Up @@ -269,7 +269,7 @@ def upload
end
else
@in_a_form = true
add_flash(_("Use the Browse button to locate an Import file"), :error)
add_flash(_("Use the Choose file button to locate an Import file"), :error)
# render :action=>"import_export"
import_export
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/miq_policy_controller.rb
Expand Up @@ -158,7 +158,7 @@ def upload
:action => "export")
end
else
redirect_options.merge!(:flash_msg => _("Use the Browse button to locate an Import file"),
redirect_options.merge!(:flash_msg => _("Use the Choose file button to locate an Import file"),
:flash_error => true,
:action => "export")
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/ops_controller/settings.rb
Expand Up @@ -26,7 +26,7 @@ def apply_imports
session[:imports] = @sb[:imports] = nil
end
else
msg = _("Use the Browse button to locate CSV file")
msg = _("Use the Choose file button to locate CSV file")
err = true
end
@sb[:show_button] = err
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/ops_controller/settings/upload.rb
Expand Up @@ -34,7 +34,7 @@ def upload_logos(typ)
err = false
end
else
msg = _("Use the Browse button to locate .png image file")
msg = _("Use the Choose file button to locate .png image file")
err = true
end
redirect_to :action => 'explorer', :flash_msg => msg, :flash_error => err, :no_refresh => true
Expand Down Expand Up @@ -94,7 +94,7 @@ def upload_csv
end
end
else
msg = _("Use the Browse button to locate CSV file")
msg = _("Use the Choose file button to locate CSV file")
err = true
end
@sb[:show_button] = (@sb[:good] && @sb[:good] > 0)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/report_controller.rb
Expand Up @@ -88,7 +88,7 @@ def upload
end
else
redirect_to :action => 'explorer',
:flash_msg => _("Use the Browse button to locate an Import file"),
:flash_msg => _("Use the Choose file button to locate an Import file"),
:flash_warning => true
end
end
Expand Down Expand Up @@ -219,7 +219,7 @@ def upload_widget_import_file
upload_file = params.fetch_path(:upload, :file)

if upload_file.blank?
add_flash("Use the browse button to locate an import file", :warning)
add_flash("Use the Choose file button to locate an import file", :warning)
else
begin
@in_a_form = true
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/catalog_controller_spec.rb
Expand Up @@ -230,7 +230,7 @@

it "displays a message when an image file is not selected " do
post :st_upload_image, :params => { :format => :js, :id => @st.id, :commit => 'Upload' }
expect(assigns(:flash_array).first[:message]).to include("Use the Browse button to locate a .png or .jpg image file")
expect(assigns(:flash_array).first[:message]).to include("Use the Choose file button to locate a .png or .jpg image file")
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/miq_ae_customization_controller_spec.rb
Expand Up @@ -285,7 +285,7 @@
it "redirects with a warning message" do
post :upload_import_file, :params => params, :xhr => true
expect(controller.instance_variable_get(:@flash_array))
.to include(:message => "Use the browse button to locate an import file", :level => :warning)
.to include(:message => "Use the Choose file button to locate an import file", :level => :warning)
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/miq_ae_tools_controller_spec.rb
Expand Up @@ -401,7 +401,7 @@
post :upload_import_file, :params => params, :xhr => true
expect(response).to redirect_to(
:action => :review_import,
:message => {:message => "Use the browse button to locate an import file", :level => :warning}.to_json
:message => {:message => "Use the Choose file button to locate an import file", :level => :warning}.to_json
)
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/miq_policy_controller_spec.rb
Expand Up @@ -60,7 +60,7 @@
expect(response).to redirect_to(
:action => "export",
:dbtype => "dbtype",
:flash_msg => "Use the Browse button to locate an Import file",
:flash_msg => "Use the Choose file button to locate an Import file",
:flash_error => true
)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/report_controller_spec.rb
Expand Up @@ -936,7 +936,7 @@
it "returns with a warning message" do
post :upload_widget_import_file, :params => params, :xhr => true
expect(controller.instance_variable_get(:@flash_array))
.to include(:message => "Use the browse button to locate an import file", :level => :warning)
.to include(:message => "Use the Choose file button to locate an import file", :level => :warning)
end
end

Expand Down

0 comments on commit 72ecfd9

Please sign in to comment.