Skip to content

Commit

Permalink
Merge pull request #2461 from elad661/change-docker-lables-to-image-l…
Browse files Browse the repository at this point in the history
…abels

Change "Docker Labels" to "Image Labels"
  • Loading branch information
himdel committed Oct 19, 2017
2 parents 7f319eb + a791455 commit 85869ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/helpers/container_image_helper/textual_summary.rb
Expand Up @@ -127,6 +127,6 @@ def collect_env_variables
end

def textual_group_container_docker_labels
TextualGroup.new(_("Docker Labels"), textual_key_value_group(@record.docker_labels.to_a))
TextualGroup.new(_("Image Labels"), textual_key_value_group(@record.docker_labels.to_a))
end
end
2 changes: 1 addition & 1 deletion app/views/chargeback/_cb_assignments.html.haml
Expand Up @@ -30,7 +30,7 @@
- if !@edit[:new][:cbshow_typ].blank? && @edit[:new][:cbshow_typ].ends_with?("-labels")
.form-group
%label.col-md-2.control-label
= _('Docker Labels')
= _('Image Labels')
.col-md-8
- options = Array(@edit[:cb_assign][:docker_label_keys].invert).sort_by { |a| a.first.downcase }
= select_tag("cblabel_key", options_for_select([["<#{_('Choose a Label')}>", ""]] + options, @edit[:new][:cblabel_key].to_s),
Expand Down

0 comments on commit 85869ec

Please sign in to comment.