From 382c172976ad6b19a4544d665065820662f679b9 Mon Sep 17 00:00:00 2001 From: qiaomin Date: Sun, 7 Jan 2018 23:15:56 +0800 Subject: [PATCH] Use 'trimmed' for blocktrans in multi-line strings 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 --- .../cluster_templates/_config_domain_names_help.html | 2 +- .../cluster_templates/_configure_general_help.html | 6 +++--- .../cluster_wizard/_plugin_select_help.html | 2 +- .../templates/cluster_wizard/cluster_guide.html | 12 ++++++------ .../clusters/templates/image_registry/_help.html | 4 ++-- .../nodegroup_templates/_configure_general_help.html | 4 ++-- .../job_binaries/_create_job_binary_help.html | 4 ++-- .../templates/job_templates/_create_job_help.html | 2 +- .../templates/job_wizard/_job_type_select_help.html | 2 +- .../jobs/templates/job_wizard/jobex_guide.html | 8 ++++---- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_config_domain_names_help.html b/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_config_domain_names_help.html index 187d4181..627f7029 100644 --- a/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_config_domain_names_help.html +++ b/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_config_domain_names_help.html @@ -4,7 +4,7 @@ {% blocktrans %}Select the domain name for internal and external hostname resolution.{% endblocktrans %}

- {% 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 "DNS" tab on the left menu or by executing "designate domain-list" on the controller node.{% endblocktrans %} diff --git a/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_configure_general_help.html b/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_configure_general_help.html index c78ec1d4..2b59c202 100644 --- a/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_configure_general_help.html +++ b/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_configure_general_help.html @@ -13,7 +13,7 @@

{% blocktrans %}Warning!{% endblocktrans %}

-

{% blocktrans %} Version: {{ hadoop_version }} +

{% blocktrans trimmed %} Version: {{ hadoop_version }} of plugin {{ plugin_name }} is now deprecated. {% endblocktrans %}

@@ -21,14 +21,14 @@
{% endif %}

- {% 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 "Node Groups" tab.{% endblocktrans %}

{% blocktrans %}You may set cluster scoped configurations on corresponding tabs.{% endblocktrans %}

- {% 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 %}

diff --git a/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/_plugin_select_help.html b/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/_plugin_select_help.html index f51043fa..316d52b4 100644 --- a/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/_plugin_select_help.html +++ b/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/_plugin_select_help.html @@ -1,5 +1,5 @@ {% load i18n horizon %}

- {% 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 %}

diff --git a/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/cluster_guide.html b/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/cluster_guide.html index a4a5c035..b3df1274 100644 --- a/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/cluster_guide.html +++ b/sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/cluster_guide.html @@ -8,7 +8,7 @@
  1. -
    {% blocktrans %}The first step is to determine which type of +
    {% 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 @@
  2. -
    {% blocktrans %}You need to register an image to launch instances +
    {% 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 @@
  3. -
    {% blocktrans %}Next, you need to define the different +
    {% 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 @@
  4. -
    {% blocktrans %}Repeat the Node Group Template +
    {% blocktrans trimmed %}Repeat the Node Group Template creation process, but this time you are creating your "worker" Node Group Template.{% endblocktrans %}
    @@ -132,7 +132,7 @@
  5. -
    {% blocktrans %}Now you need to set the layout of your +
    {% 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 @@
  6. -
    {% blocktrans %}You are now ready to +
    {% 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 diff --git a/sahara_dashboard/content/data_processing/clusters/templates/image_registry/_help.html b/sahara_dashboard/content/data_processing/clusters/templates/image_registry/_help.html index 77092d24..09cf4eb9 100644 --- a/sahara_dashboard/content/data_processing/clusters/templates/image_registry/_help.html +++ b/sahara_dashboard/content/data_processing/clusters/templates/image_registry/_help.html @@ -13,12 +13,12 @@

    {% blocktrans %}Warning!{% endblocktrans %}

    -

    {% blocktrans %} Input correct User Name for image. For Ubuntu images input 'ubuntu', 'fedora' for Fedora images, +

    {% 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 %}

    - {% 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 "Add" button.{% endblocktrans %}

    diff --git a/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_configure_general_help.html b/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_configure_general_help.html index 2863c6c0..cea39739 100644 --- a/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_configure_general_help.html +++ b/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_configure_general_help.html @@ -12,7 +12,7 @@

    {% blocktrans %}Warning!{% endblocktrans %}

    -

    {% blocktrans %} Version: {{ hadoop_version }} +

    {% blocktrans trimmed %} Version: {{ hadoop_version }} of plugin {{ plugin_name }} is now deprecated. {% endblocktrans %}

    @@ -21,7 +21,7 @@ {% endif %}

    - {% 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 node scoped configurations on corresponding tabs.{% endblocktrans %} diff --git a/sahara_dashboard/content/data_processing/jobs/templates/job_binaries/_create_job_binary_help.html b/sahara_dashboard/content/data_processing/jobs/templates/job_binaries/_create_job_binary_help.html index fd2a877d..e08aa2f2 100644 --- a/sahara_dashboard/content/data_processing/jobs/templates/job_binaries/_create_job_binary_help.html +++ b/sahara_dashboard/content/data_processing/jobs/templates/job_binaries/_create_job_binary_help.html @@ -1,7 +1,7 @@ {% load i18n horizon %}

    - {% blocktrans %}Important: The name that you give your job binary will be the name used in your job execution. + {% blocktrans trimmed %}Important: 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 %}

    @@ -29,4 +29,4 @@

    {% blocktrans %}You may also enter an optional description for your job binary.{% endblocktrans %}

    -
    \ No newline at end of file +
    diff --git a/sahara_dashboard/content/data_processing/jobs/templates/job_templates/_create_job_help.html b/sahara_dashboard/content/data_processing/jobs/templates/job_templates/_create_job_help.html index f3b52913..ade10193 100644 --- a/sahara_dashboard/content/data_processing/jobs/templates/job_templates/_create_job_help.html +++ b/sahara_dashboard/content/data_processing/jobs/templates/job_templates/_create_job_help.html @@ -23,7 +23,7 @@ {% blocktrans %}For Storm, Storm Pyleus, Spark and Shell jobs, only a main is required,"libs" are optional.{% endblocktrans %}

    - {% 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 %}

    diff --git a/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/_job_type_select_help.html b/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/_job_type_select_help.html index b7aa613c..0d616536 100644 --- a/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/_job_type_select_help.html +++ b/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/_job_type_select_help.html @@ -1,6 +1,6 @@ {% load i18n horizon %}

    - {% 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 %} diff --git a/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/jobex_guide.html b/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/jobex_guide.html index a388a92d..31ebbe0e 100644 --- a/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/jobex_guide.html +++ b/sahara_dashboard/content/data_processing/jobs/templates/job_wizard/jobex_guide.html @@ -9,7 +9,7 @@

  7. - {% 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 %}
  8. -
    {% blocktrans %}Data Sources are what your +
    {% 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 %}
  9. -
    {% blocktrans %}Define your Job Template. +
    {% 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 @@
  10. -
    {% blocktrans %}Launch your job. When +
    {% 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,