openstack/sahara-dashboard
Code Issues Proposed changes

Use 'trimmed' for blocktrans in multi-line strings

Browse Source 
blocktrans trimmed option removes newlines from contents of blocktrans
and replaces any whitespace at the beginning and end of a line into
a single space. This makes translator life easier.

Closes-Bug: #1741761
Change-Id: I7e8d5337553fff595e66ea406f6528bb6b36ff94
This commit is contained in:
qiaomin 2018-01-07 23:15:56 +08:00
parent 094c06397e
commit 382c172976
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_config_domain_names_help.html
View File

@ -4,7 +4,7 @@
{% blocktrans %}Select the domain name for internal and external hostname resolution.{% endblocktrans %}
</p>
<p>
{% blocktrans %}Selected domain name should already exist in the Designate.
{% blocktrans trimmed %}Selected domain name should already exist in the Designate.
You can check it in &quot;DNS&quot; tab on the left menu or by executing
&quot;designate domain-list&quot;
on the controller node.{% endblocktrans %}

6
sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_configure_general_help.html
View File

@ -13,7 +13,7 @@
<div class="alert alert-dismissable alert-warning">
<button type="button" class="close" data-dismiss="alert">×</button>
<h4><span class="ng-scope">{% blocktrans %}Warning!{% endblocktrans %}</span></h4>
<p> {% blocktrans %} Version: <b>{{ hadoop_version }}</b>
<p> {% blocktrans trimmed %} Version: <b>{{ hadoop_version }}</b>
of plugin <b>{{ plugin_name }} </b>
is now deprecated. {% endblocktrans %}
</p>
@ -21,14 +21,14 @@
</div>
{% endif %}
<p>
{% blocktrans %}The Cluster Template object should specify Node Group Templates that will be used to build a Cluster.
{% blocktrans trimmed %}The Cluster Template object should specify Node Group Templates that will be used to build a Cluster.
You can add Node Groups using Node Group Templates on a &quot;Node Groups&quot; tab.{% endblocktrans %}
</p>
<p>
{% blocktrans %}You may set <b>cluster</b> scoped configurations on corresponding tabs.{% endblocktrans %}
</p>
<p>
{% blocktrans %}The Cluster Template object may specify a list of processes in anti-affinity group.
{% blocktrans trimmed %}The Cluster Template object may specify a list of processes in anti-affinity group.
That means these processes may not be launched more than once on a single host.{% endblocktrans %}
</p>
</div>

2
sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/_plugin_select_help.html
View File

@ -1,5 +1,5 @@
{% load i18n horizon %}
<p class="well">
{% blocktrans %}Select which plugin and version that you
{% blocktrans trimmed %}Select which plugin and version that you
want to use to create your cluster.{% endblocktrans %}
</p>

12
sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/cluster_guide.html
View File

@ -8,7 +8,7 @@
<ol>
<li>
<div>
<div>{% blocktrans %}The first step is to determine which type of
<div>{% blocktrans trimmed %}The first step is to determine which type of
cluster you want to run. You may have several choices
available depending on the configuration of your system.
Click on "choose plugin" to bring up the list of data
@ -39,7 +39,7 @@
<hr/>
<li>
<div>
<div>{% blocktrans %}You need to register an image to launch instances
<div>{% blocktrans trimmed %}You need to register an image to launch instances
of your cluster. Skip this step if you already have a registered image
for your plugin, otherwise click the link below. In the form you will
need to choose the image, input the username and add tags for the chosen plugin.
@ -55,7 +55,7 @@
<hr/>
<li>
<div>
<div>{% blocktrans %}Next, you need to define the different
<div>{% blocktrans trimmed %}Next, you need to define the different
types of machines in your cluster. This is done by
defining a Node Group Template for each type of
machine. A very common case is where you
@ -97,7 +97,7 @@
<hr/>
<li>
<div>
<div>{% blocktrans %}Repeat the Node Group Template
<div>{% blocktrans trimmed %}Repeat the Node Group Template
creation process, but this time you are creating
your "worker" Node Group Template.{% endblocktrans %}
</div>
@ -132,7 +132,7 @@
<hr/>
<li>
<div>
<div>{% blocktrans %}Now you need to set the layout of your
<div>{% blocktrans trimmed %}Now you need to set the layout of your
cluster. By
creating a Cluster Template, you will be choosing the
number of instances of each Node Group Template that
@ -164,7 +164,7 @@
<hr/>
<li>
<div>
<div>{% blocktrans %}You are now ready to
<div>{% blocktrans trimmed %}You are now ready to
launch your cluster. When you click on the link
below, you will need to give your cluster a name,
choose the Cluster Template to use and choose which

4
sahara_dashboard/content/data_processing/clusters/templates/image_registry/_help.html
View File

@ -13,12 +13,12 @@
<div class="alert alert-dismissable alert-warning">
<button type="button" class="close" data-dismiss="alert">×</button>
<h4><span class="ng-scope">{% blocktrans %}Warning!{% endblocktrans %}</span></h4>
<p> {% blocktrans %} Input correct User Name for image. For Ubuntu images input 'ubuntu', 'fedora' for Fedora images,
<p> {% blocktrans trimmed %} Input correct User Name for image. For Ubuntu images input 'ubuntu', 'fedora' for Fedora images,
'cloud-user' for CentOS 6.x images and 'centos' for CentOS 7.x images.{% endblocktrans %} </p>
</div>
</div>
<p>
{% blocktrans %}Tags are used for filtering images suitable for each plugin and each Data Processing version.
{% blocktrans trimmed %}Tags are used for filtering images suitable for each plugin and each Data Processing version.
To add required tags, select a plugin and a Data Processing version and click the &quot;Add&quot; button.{% endblocktrans %}
</p>
<p>

4
sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_configure_general_help.html
View File

@ -12,7 +12,7 @@
<div class="alert alert-dismissable alert-warning">
<button type="button" class="close" data-dismiss="alert">×</button>
<h4><span class="ng-scope">{% blocktrans %}Warning!{% endblocktrans %}</span></h4>
<p> {% blocktrans %} Version: <b>{{ hadoop_version }}</b>
<p> {% blocktrans trimmed %} Version: <b>{{ hadoop_version }}</b>
of plugin <b>{{ plugin_name }} </b>
is now deprecated. {% endblocktrans %}
</p>
@ -21,7 +21,7 @@
{% endif %}
</p>
<p>
{% blocktrans %}The Node Group Template object specifies the processes
{% blocktrans trimmed %}The Node Group Template object specifies the processes
that will be launched on each instance. Check one or more processes.
When processes are selected, you may set <b>node</b> scoped
configurations on corresponding tabs.{% endblocktrans %}

4
sahara_dashboard/content/data_processing/jobs/templates/job_binaries/_create_job_binary_help.html
View File

@ -1,7 +1,7 @@
{% load i18n horizon %}
<div class="well">
<p>
{% blocktrans %}<b>Important</b>: The name that you give your job binary will be the name used in your job execution.
{% blocktrans trimmed %}<b>Important</b>: The name that you give your job binary will be the name used in your job execution.
If your binary requires a particular name or extension (ie: ".jar"), be sure to include it here.{% endblocktrans %}
</p>
<p>
@ -29,4 +29,4 @@
<p>
{% blocktrans %}You may also enter an optional description for your job binary.{% endblocktrans %}
</p>
</div>
</div>

2
sahara_dashboard/content/data_processing/jobs/templates/job_templates/_create_job_help.html
View File

@ -23,7 +23,7 @@
{% blocktrans %}For Storm, Storm Pyleus, Spark and Shell jobs, only a main is required,"libs" are optional.{% endblocktrans %}
</p>
<p>
{% blocktrans %}For MapReduce or Java Action jobs, "mains" are not applicable. You are required to add one
{% blocktrans trimmed %}For MapReduce or Java Action jobs, "mains" are not applicable. You are required to add one
or more "libs" for these jobs.{% endblocktrans %}
</p>
<p>

2
sahara_dashboard/content/data_processing/jobs/templates/job_wizard/_job_type_select_help.html
View File

@ -1,6 +1,6 @@
{% load i18n horizon %}
<p class="well">
{% blocktrans %}Select which type of job that you want to run.
{% blocktrans trimmed %}Select which type of job that you want to run.
This choice will dictate which steps are required to successfully
execute your job.
{% endblocktrans %}

8
sahara_dashboard/content/data_processing/jobs/templates/job_wizard/jobex_guide.html
View File

@ -9,7 +9,7 @@
<li>
<div>
<div>
{% blocktrans %}First, select which type of job that
{% blocktrans trimmed %}First, select which type of job that
you want to run. This choice will determine which
other steps are required
{% endblocktrans %}
@ -38,7 +38,7 @@
{% if view.show_data_sources %}
<li>
<div>
<div>{% blocktrans %}Data Sources are what your
<div>{% blocktrans trimmed %}Data Sources are what your
job uses for input and output. Depending on the type
of job you will be running, you may need to define one
or more data sources. You can create multiple data
@ -57,7 +57,7 @@
{% endif %}
<li>
<div>
<div>{% blocktrans %}Define your Job Template.
<div>{% blocktrans trimmed %}Define your Job Template.
This is where you choose the type of job that you
want to run (Pig, Java Action, Spark, etc) and choose
or upload the files necessary to run it. The inputs
@ -85,7 +85,7 @@
<hr/>
<li>
<div>
<div>{% blocktrans %}Launch your job. When
<div>{% blocktrans trimmed %}Launch your job. When
launching, you may need to choose your input and
output data sources. This is where you would also
add any special configuration values, parameters,