Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #2600 - fixed gettext extraction on vms forms #1079

Closed
wants to merge 2 commits into from
Closed

fixes #2600 - fixed gettext extraction on vms forms #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4bf983
fixes #2600 - fixed gettext extraction on vms forms
lzap Dec 6, 2013
acd428e
fixes #2600 - more CR form i18n extraction
Dec 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/views/compute_resources_vms/form/_ec2.html.erb
View file
Open in desktop
@@ -1,12 +1,12 @@
<%= select_f f, :flavor_id, compute_resource.flavors, :id, :to_label %>
<%= select_f f, :flavor_id, compute_resource.flavors, :id, :to_label, {}, :label => _('Flavor') %>
<%
arch ||= nil ; os ||= nil
images = possible_images(compute_resource, arch, os)
%>

<div id='image_selection'><%= select_f f, :image_id, images, :uuid, :name,{:include_blank => (images.empty? || images.size == 1) ? false : _('Please select an image')}, {:disabled => images.empty? } %></div>
<div id='image_selection'><%= select_f f, :image_id, images, :uuid, :name,{:include_blank => (images.empty? || images.size == 1) ? false : _('Please select an image')}, {:disabled => images.empty?, :label => _('Image')} %></div>

<%= selectable_f f, :availability_zone, compute_resource.zones, {:include_blank => _("No preference")} %>
<%= selectable_f f, :availability_zone, compute_resource.zones, {:include_blank => _("No preference")}, :label => _('Availability zone') %>

<div id='subnet_selection'>
<% if compute_resource.subnets.any? %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/compute_resources_vms/form/_gce.html.erb
View file
Open in desktop
@@ -1,12 +1,12 @@
<%= select_f f, :machine_type, compute_resource.flavors, :id, :name %>
<%= select_f f, :machine_type, compute_resource.flavors, :id, :name, {}, :label => _('Machine type') %>
<%
arch ||= nil ; os ||= nil
images = possible_images(compute_resource, arch, os)
%>
<div id='image_selection'>
<%= select_f f, :image_id, images, :uuid, :name,
{ :include_blank => (images.empty? || images.size == 1) ? false : _('Please select an image') },
{ :disabled => images.empty? } %>
{ :disabled => images.empty?, :label => _('Image') } %>
</div>
<%= selectable_f f, :network, compute_resource.networks, {} %>
<%= selectable_f f, :network, compute_resource.networks, :label => _('Network') %>
<%= checkbox_f f, :external_ip, :label => _('External IP') %>
6 changes: 3 additions & 3 deletions app/views/compute_resources_vms/form/_libvirt.html.erb
View file
Open in desktop
@@ -1,7 +1,7 @@
<% new = f.object && f.object.new? %>
<%= text_f f, :name, :disabled => !new if controller_name != "hosts" %>
<%= selectable_f f, :cpus, 1..compute_resource.max_cpu_count, { }, :class => "input-mini",:disabled => !new %>
<%= selectable_f f, :memory, memory_options(compute_resource.max_memory), { }, :class => "span2", :disabled => !new %>
<%= selectable_f f, :cpus, 1..compute_resource.max_cpu_count, { }, :class => "input-mini", :disabled => !new, :label => _('CPUs') %>
<%= selectable_f f, :memory, memory_options(compute_resource.max_memory), { }, :class => "span2", :disabled => !new, :label => _('Memory') %>

<!--NICS-->
<div class="children_fields">
Expand Down Expand Up @@ -30,4 +30,4 @@
</div>
<!--TODO # Move to a helper-->
<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine") } if new %>
<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine"), :label => _('Start')} if new %>
4 changes: 2 additions & 2 deletions app/views/compute_resources_vms/form/_openstack.html.erb
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@
{ :include_blank => (images.empty? || images.size == 1) ? false : _('Please select an image') },
{ :disabled => images.empty?, :label => _("Image") } %>
</div>
<%= select_f f, :tenant_id, compute_resource.tenants, :id, :name %>
<%= select_f f, :tenant_id, compute_resource.tenants, :id, :name, {}, :label => _('Tenant') %>

<%= select_f f, :security_groups, compute_resource.security_groups, :name, :name, {}, :label => _("Security Group") %>
<%= select_f f, :security_groups, compute_resource.security_groups, :name, :name, {}, :label => _("Security group") %>
<%= selectable_f f, :network, compute_resource.address_pools, { :prompt => "None" }, { :label => _("Floating IP network") } %>

12 changes: 7 additions & 5 deletions app/views/compute_resources_vms/form/_ovirt.html.erb
View file
Open in desktop
Expand Up @@ -5,18 +5,20 @@
<%= select_f f, :cluster, clusters, :id, :name, { },
{ :disabled => !new, :'data-url' => cluster_selected_compute_resource_path(compute_resource),
:onchange => 'ovirt_clusterSelected(this);',
:help_inline => :indicator } %>
:help_inline => :indicator,
:label => _('Cluster') } %>
<%= f.hidden_field :cluster if !new %>
<%= select_f f, :template, compute_resource.hardware_profiles, :id, :name, {:include_blank => _("Select template")},
{ :disabled => !new, :'data-url' => hardware_profile_selected_compute_resource_path(compute_resource),
:onchange => 'ovirt_hwpSelected(this);',
:help_inline => :indicator,
:help_block => _("Template / Hardware Profile to use")} %>
:help_block => _("Template / Hardware Profile to use"),
:label => _('Template') } %>
<%= f.hidden_field :template if !new %>

<div class='hardware_profile'>
<%= selectable_f f, :cores, 1..compute_resource.max_cpu_count, { }, :class => "input-mini" %>
<%= selectable_f f, :memory, memory_options(compute_resource.max_memory), { }, :class => "span2" %>
<%= selectable_f f, :cores, 1..compute_resource.max_cpu_count, { }, :class => "input-mini", :label => _('Cores') %>
<%= selectable_f f, :memory, memory_options(compute_resource.max_memory), { }, :class => "span2", :label => _('Memory') %>
<div class="children_fields">
<%= new_child_fields_template(f, :interfaces, {
:object => compute_resource.new_interface,
Expand All @@ -40,4 +42,4 @@
</div>
</div>
<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine") } if new %>
<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine"), :label => _('Start') } if new %>
2 changes: 1 addition & 1 deletion app/views/compute_resources_vms/form/_rackspace.html.erb
View file
Open in desktop
@@ -1,4 +1,4 @@
<%= select_f f, :flavor_id, compute_resource.flavors, :id, :name %>
<%= select_f f, :flavor_id, compute_resource.flavors, :id, :name, {}, {:label => _('Flavor')} %>
<%
arch ||= nil ; os ||= nil
images = possible_images(compute_resource, arch, os)
Expand Down
8 changes: 4 additions & 4 deletions app/views/compute_resources_vms/form/_vmware.html.erb
View file
Open in desktop
@@ -1,10 +1,10 @@
<% new = @host ? @host.created_at.nil? : true %>
<%= text_f f, :name, :disabled => !new if controller_name != "hosts" %>
<%= selectable_f f, :cpus, 1..compute_resource.max_cpu_count, { }, :class => "input-mini", :disabled => !new %>
<%= selectable_f f, :cpus, 1..compute_resource.max_cpu_count, { }, :class => "input-mini", :disabled => !new, :label => _('CPUs') %>
<%= text_f f, :memory_mb, :class => "span2", :disabled => !new, :label => _("Memory (MB)") %>
<%= selectable_f f, :cluster, compute_resource.clusters, { }, :class => "span2", :disabled => !new %>
<%= selectable_f f, :cluster, compute_resource.clusters, { }, :class => "span2", :disabled => !new, :label => _('Cluster') %>
<%# selectable_f f, :resource_pool, compute_resource.resource_pools, { }, :class => "span2", :disabled => !new %>
<%= select_f f, :path, compute_resource.folders, :path, :to_label , {}, { :label => "Folder", :class => "span2", :disabled => !new } %>
<%= select_f f, :path, compute_resource.folders, :path, :to_label , {}, { :label => _("Folder"), :class => "span2", :disabled => !new } %>

<!--interfaces-->
<div class="children_fields">
Expand Down Expand Up @@ -38,4 +38,4 @@

<!--TODO # Move to a helper-->
<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine") } if new and controller_name == 'hosts' %>
<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine"), :label => _('Start') } if new and controller_name == 'hosts' %>
2 changes: 1 addition & 1 deletion app/views/compute_resources_vms/form/libvirt/_network.html.erb
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<% bridge = compute_resource.interfaces %>

<%= selectable_f f, :type, libvirt_networks(compute_resource), {},
{ :label => _('Network Type'), :help_inline =>
{ :label => _('Network type'), :help_inline =>
remove_child_link('X', f, { :method => :'_delete', :title => _('remove network interface'),
:class => 'label label-important disable-unsupported' }),
:onchange => 'libvirt_network_selected(this)' } %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/compute_resources_vms/form/libvirt/_volume.html.erb
View file
Open in desktop
@@ -1,5 +1,5 @@
<div class="fields">
<%= selectable_f f, :pool_name, compute_resource.storage_pools.map(&:name), { }, :class => "span2", :label => _("Storage Pool") %>
<%= selectable_f f, :pool_name, compute_resource.storage_pools.map(&:name), { }, :class => "span2", :label => _("Storage pool") %>
<%= text_f f, :capacity, :class => "input-mini", :label => _("Size (GB)") %>
<%= select_f f, :format_type, %w[RAW QCOW2],:downcase, :to_s, { }, :class => "span2", :label => _("Type"),
:help_inline => remove_child_link("X", f, { :method => :'_delete', :title => _('remove network interface'), :class => 'label label-important disable-unsupported' }) %>
Expand Down
5 changes: 3 additions & 2 deletions app/views/compute_resources_vms/form/ovirt/_network.html.erb
View file
Open in desktop
@@ -1,13 +1,14 @@
<div class="fields">
<% if f.object._delete != '1' %>
<% disabled = (f.object.persisted? == "true" || f.object.persisted? == true) %>
<%= text_f f, :name, :disabled => disabled, :class => "span2" %>
<%= text_f f, :name, :disabled => disabled, :class => "span2", :label => _('Name') %>
<%= f.hidden_field :name if disabled %>
<% selected_cluster = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:cluster] %>
<% selected_cluster ||= clusters.size == 1 ? clusters.first.id : nil %>
<%= select_f f, :network, compute_resource.networks(selected_cluster ? { :cluster_id => selected_cluster } : { }), :id, :name,
{ }, :disabled => disabled, :class => "span2",
:help_inline => remove_child_link("X", f, { :method => :'_delete', :title => _('remove network interface'), :class => 'label label-important' }) %>
:help_inline => remove_child_link("X", f, { :method => :'_delete', :title => _('remove network interface'), :class => 'label label-important' }),
:label => _('Network') %>
<%= f.hidden_field :network if disabled %>
<% end %>
</div>
4 changes: 2 additions & 2 deletions app/views/compute_resources_vms/form/ovirt/_volume.html.erb
View file
Open in desktop
Expand Up @@ -5,13 +5,13 @@
<%= text_f f,:size_gb, :label => _('Size (GB)'), :disabled => disabled, :class => "span2" %>
<%= f.hidden_field :size_gb if disabled %>
<%= select_f f, :storage_domain, compute_resource.storage_domains, :id, :name,
{ }, :label => _('Storage Domain'), :disabled => disabled, :class => "span2",
{ }, :label => _('Storage domain'), :disabled => disabled, :class => "span2",
:help_inline=> remove_child_link("X", f, { :method => :'_delete', :title => _('remove volume'), :class => 'label label-important' }) %>
<%= f.hidden_field :storage_domain if disabled %>
<%= f.hidden_field :id %>
<%= field(f, :bootable, :label => _('Bootable')) do
radio_button_f f, :bootable, {:disabled => disabled, :value=>'true', :checked => (f.object.bootable == 'true'), :onclick => 'bootable_radio(this)',
:text => _('Only one volume can be Bootable')}
:text => _('Only one volume can be bootable')}
end %>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/compute_resources_vms/form/vmware/_volume.html.erb
View file
Open in desktop
@@ -1,6 +1,6 @@
<div class="fields">
<%= selectable_f f, :datastore, vsphere_datastores(compute_resource), { }, :class => "span4 disable-unsupported", :label => _("Data Store") %>
<%= text_f f, :name, :class => "input-mini disable-unsupported", :label => "Name" %>
<%= selectable_f f, :datastore, vsphere_datastores(compute_resource), { }, :class => "span4 disable-unsupported", :label => _("Data store") %>
<%= text_f f, :name, :class => "input-mini disable-unsupported", :label => _("Name") %>
<%= text_f f, :size_gb,
:class => "input-mini disable-unsupported",
:label => _("Size (GB)") %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/hosts/_operating_system.html.erb
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
</div>
<!-- this section is used for displaying the provisioning scripts-->
<div class="control-group">
<div class="control-label"> Provisioning Templates</div>
<div class="control-label"><%= _('Provisioning templates') %></div>
<div class="controls">
<%= link_to_function icon_text("refresh", _("Resolve")), "template_info('#templates_info','#{template_used_hosts_url}')", :class => "btn" %>
<%= popover("?", _("Display the templates that will be used to provision this host"), :title=>_("Provisioning Templates")) %>
Expand Down