Browse Source

Merge "i18n: Do not include html directives in translation strings"

Zuul 1 year ago
parent
commit
dbb60756af

+ 2
- 2
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html View File

@@ -9,8 +9,8 @@
9 9
     <div class="row">
10 10
       <div class="col-sm-12 col-md-6">
11 11
         <div class="form-group required">
12
-          <label translate class="control-label" for="floating-ip">
13
-            Floating IP address or pool
12
+          <label class="control-label" for="floating-ip">
13
+            <translate>Floating IP address or pool</translate>
14 14
             <span class="hz-icon-required fa fa-asterisk"></span>
15 15
           </label>
16 16
           <select class="form-control" name="floating-ip" id="floating-ip"

+ 2
- 2
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.html View File

@@ -10,8 +10,8 @@
10 10
       <div class="col-sm-12 col-md-6">
11 11
         <div class="form-group required"
12 12
              ng-class="{ 'has-error': form.weight.$invalid && form.weight.$dirty }">
13
-          <label translate class="control-label" for="weight">
14
-            Weight
13
+          <label class="control-label" for="weight">
14
+            <translate>Weight</translate>
15 15
             <span class="hz-icon-required fa fa-asterisk"></span>
16 16
           </label>
17 17
           <input name="weight" id="weight" type="number" class="form-control"

+ 5
- 3
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.help.html View File

@@ -2,18 +2,20 @@
2 2
   If the listener uses the TERMINATED_HTTPS protocol, then one or more SSL certificates must
3 3
   be selected. The first certificate will be the default.
4 4
 </p>
5
-<p translate>
5
+<p>
6
+  <translate>
6 7
   Use the key-manager service to create any certificate containers before creating the listener.
7 8
   The following documentation provides information on how to create a certificate container:
9
+  </translate>
8 10
   <ul>
9 11
     <li>
10 12
       <a target="_blank" href="http://developer.openstack.org/api-guide/key-manager/containers.html#certificate-containers">
11
-        Key Manager API Guide: Creating a Certificate Container
13
+        <translate>Key Manager API Guide: Creating a Certificate Container</translate>
12 14
       </a>
13 15
     </li>
14 16
     <li>
15 17
       <a target="_blank" href="http://docs.openstack.org/cli-reference/barbican.html">
16
-        Key Manager Service Command-Line Client
18
+        <translate>Key Manager Service Command-Line Client</translate>
17 19
       </a>
18 20
     </li>
19 21
   </ul>

+ 8
- 4
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html View File

@@ -3,13 +3,17 @@
3 3
   tied to the load balancer. Multiple listeners can be associated with the same load balancer but
4 4
   each must use a unique port.
5 5
 </p>
6
-<p translate>
7
-  <strong>Protocol:</strong>
6
+<p>
7
+  <strong translate>Protocol:</strong>
8
+  <translate>
8 9
   The protocol for which the front end listens. The TERMINATED_HTTPS protocol is only available if
9 10
   the key-manager service is enabled and you have authority to list certificate containers and
10 11
   secrets.
12
+  </translate>
11 13
 </p>
12
-<p translate>
13
-  <strong>Port:</strong>
14
+<p>
15
+  <strong translate>Port:</strong>
16
+  <translate>
14 17
   The port on which the front end listens. Must be an integer from 1 to 65535.
18
+  </translate>
15 19
 </p>

+ 4
- 4
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html View File

@@ -25,8 +25,8 @@
25 25
 
26 26
     <div class="col-xs-12 col-sm-8 col-md-6">
27 27
       <div class="form-group required">
28
-        <label translate class="control-label" for="protocol">
29
-          Protocol
28
+        <label class="control-label" for="protocol">
29
+          <translate>Protocol</translate>
30 30
           <span class="hz-icon-required fa fa-asterisk"></span>
31 31
         </label>
32 32
         <select class="form-control" name="protocol" id="protocol"
@@ -42,8 +42,8 @@
42 42
     <div class="col-xs-12 col-sm-8 col-md-6">
43 43
       <div class="form-group required"
44 44
            ng-class="{ 'has-error': listenerDetailsForm.port.$invalid && listenerDetailsForm.port.$dirty }">
45
-        <label translate class="control-label" for="port">
46
-          Port
45
+        <label class="control-label" for="port">
46
+          <translate>Port</translate>
47 47
           <span class="hz-icon-required fa fa-asterisk"></span>
48 48
         </label>
49 49
         <input name="port" id="port" type="number" class="form-control"

+ 8
- 4
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.help.html View File

@@ -1,13 +1,17 @@
1 1
 <p translate>
2 2
   The load balancer occupies a neutron network port and has an IP address assigned from a subnet.
3 3
 </p>
4
-<p translate>
5
-  <strong>IP address:</strong>
4
+<p>
5
+  <strong translate>IP address:</strong>
6
+  <translate>
6 7
   If an IP address is provided it must be a well-formed IPv4 or IPv6 address. The system will
7 8
   attempt to assign the provided IP address to the load balancer. If an IP address is not provided
8 9
   then one will be allocated for you.
10
+  </translate>
9 11
 </p>
10
-<p translate>
11
-  <strong>Subnet:</strong>
12
+<p>
13
+  <strong translate>Subnet:</strong>
14
+  <translate>
12 15
   The network on which to allocate the load balancer's IP address.
16
+  </translate>
13 17
 </p>

+ 2
- 2
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html View File

@@ -38,8 +38,8 @@
38 38
 
39 39
     <div class="col-xs-12 col-sm-8 col-md-6">
40 40
       <div class="form-group required">
41
-        <label translate class="control-label" for="subnet">
42
-          Subnet
41
+        <label class="control-label" for="subnet">
42
+          <translate>Subnet</translate>
43 43
           <span class="hz-icon-required fa fa-asterisk"></span>
44 44
         </label>
45 45
         <select class="form-control" name="subnet" id="subnet"

+ 16
- 8
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.help.html View File

@@ -7,22 +7,30 @@
7 7
   of the pool. Use the "Add external member" button to add a member not found in the Available
8 8
   Instances table.
9 9
 </p>
10
-<p translate>
11
-  <strong>IP address:</strong>
10
+<p>
11
+  <strong translate>IP address:</strong>
12
+  <translate>
12 13
   The IP address of the member to receive traffic from the load balancer. Must be a well-formed
13 14
   IPv4 or IPv6 address.
15
+  </translate>
14 16
 </p>
15
-<p translate>
16
-  <strong>Subnet:</strong>
17
+<p>
18
+  <strong translate>Subnet:</strong>
19
+  <translate>
17 20
   The network which contains the IP address of the member.
21
+  </translate>
18 22
 </p>
19
-<p translate>
20
-  <strong>Port:</strong>
23
+<p>
24
+  <strong translate>Port:</strong>
25
+  <translate>
21 26
   The port on which the member listens for traffic. Must be a number from 1 to 65535.
27
+  </translate>
22 28
 </p>
23
-<p translate>
24
-  <strong>Weight:</strong>
29
+<p>
30
+  <strong translate>Weight:</strong>
31
+  <translate>
25 32
   The weight of a member determines the portion of requests or connections it services compared
26 33
   to the other members of the pool. A higher weight means it will receive more traffic. Must be
27 34
   a number from 1 to 256.
35
+  </translate>
28 36
 </p>

+ 5
- 5
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html View File

@@ -11,16 +11,16 @@
11 11
              class="table table-striped table-rsp table-detail">
12 12
         <thead>
13 13
           <tr>
14
-            <th class="rsp-p1" translate>
15
-              IP Address
14
+            <th class="rsp-p1">
15
+              <translate>IP Address</translate>
16 16
               <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
17 17
             </th>
18
-            <th class="rsp-p1" translate>
19
-              Subnet
18
+            <th class="rsp-p1">
19
+              <translate>Subnet</translate>
20 20
               <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
21 21
             </th>
22 22
             <th class="rsp-p1">
23
-              Port
23
+              <translate>Port</translate>
24 24
               <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
25 25
             </th>
26 26
             <th class="rsp-p1" translate>Weight</th>

+ 24
- 12
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html View File

@@ -4,30 +4,42 @@
4 4
   to determine if the member receives new connections. Each pool can only have one health
5 5
   monitor.
6 6
 </p>
7
-<p translate>
8
-  <strong>Interval:</strong>
7
+<p>
8
+  <strong translate>Interval:</strong>
9
+  <translate>
9 10
   The interval between health checks. Must be greater than or equal to the timeout.
11
+  </translate>
10 12
 </p>
11
-<p translate>
12
-  <strong>Retries:</strong>
13
+<p>
14
+  <strong translate>Retries:</strong>
15
+  <translate>
13 16
   The number of allowed connection failures before marking the member as inactive. Must be a
14 17
   number from 1 to 10.
18
+  </translate>
15 19
 </p>
16
-<p translate>
17
-  <strong>Timeout:</strong>
20
+<p>
21
+  <strong translate>Timeout:</strong>
22
+  <translate>
18 23
   The time after which a health check times out. Must be a number greater than or equal to 0
19 24
   and less than or equal to the interval.
25
+  </translate>
20 26
 </p>
21
-<p translate>
22
-  <strong>HTTP method:</strong>
27
+<p>
28
+  <strong translate>HTTP method:</strong>
29
+  <translate>
23 30
   The HTTP method used to perform the health check.
31
+  </translate>
24 32
 </p>
25
-<p translate>
26
-  <strong>Expected status codes:</strong>
33
+<p>
34
+  <strong translate>Expected status codes:</strong>
35
+  <translate>
27 36
   The expected HTTP status codes to get from a successful health check. Must be a single number,
28 37
   a comma separated list of numbers, or a range (two numbers separated by a hyphen).
38
+  </translate>
29 39
 </p>
30
-<p translate>
31
-  <strong>URL path:</strong>
40
+<p>
41
+  <strong translate>URL path:</strong>
42
+  <translate>
32 43
   The target of the health check HTTP request to the member. Must be a valid URL path.
44
+  </translate>
33 45
 </p>

+ 8
- 8
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html View File

@@ -5,8 +5,8 @@
5 5
 
6 6
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
7 7
       <div class="form-group required">
8
-        <label translate class="control-label" for="type">
9
-          Monitor type
8
+        <label class="control-label" for="type">
9
+          <translate>Monitor type</translate>
10 10
           <span class="hz-icon-required fa fa-asterisk"></span>
11 11
         </label>
12 12
         <select class="form-control" name="type" id="type"
@@ -24,8 +24,8 @@
24 24
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
25 25
       <div class="form-group required"
26 26
            ng-class="{ 'has-error': monitorDetailsForm.interval.$invalid && monitorDetailsForm.interval.$dirty }">
27
-        <label translate class="control-label" for="interval">
28
-          Interval (sec)
27
+        <label class="control-label" for="interval">
28
+          <translate>Interval (sec)</translate>
29 29
           <span class="hz-icon-required fa fa-asterisk"></span>
30 30
         </label>
31 31
         <input name="interval" id="interval" type="number" class="form-control"
@@ -40,8 +40,8 @@
40 40
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
41 41
       <div class="form-group required"
42 42
            ng-class="{ 'has-error': monitorDetailsForm.retry.$invalid && monitorDetailsForm.retry.$dirty }">
43
-        <label translate class="control-label" for="retry">
44
-          Retries
43
+        <label class="control-label" for="retry">
44
+          <translate>Retries</translate>
45 45
           <span class="hz-icon-required fa fa-asterisk"></span>
46 46
         </label>
47 47
         <input name="retry" id="retry" type="number" class="form-control"
@@ -56,8 +56,8 @@
56 56
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
57 57
       <div class="form-group required"
58 58
            ng-class="{ 'has-error': monitorDetailsForm.timeout.$invalid && monitorDetailsForm.timeout.$dirty }">
59
-        <label translate class="control-label" for="timeout">
60
-          Timeout (sec)
59
+        <label class="control-label" for="timeout">
60
+          <translate>Timeout (sec)</translate>
61 61
           <span class="hz-icon-required fa fa-asterisk"></span>
62 62
         </label>
63 63
         <input name="timeout" id="timeout" type="number" class="form-control"

+ 7
- 5
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html View File

@@ -1,18 +1,20 @@
1 1
 <p translate>
2 2
   A pool represents a group of members over which the load balancing will be applied.
3 3
 </p>
4
-<p translate>
5
-  <strong>Method:</strong>
4
+<p>
5
+  <strong translate>Method:</strong>
6
+  <translate>
6 7
   The load balancer algorithm that distributes traffic to the pool members.
8
+  </translate>
7 9
   <ul>
8
-    <li>
10
+    <li translate>
9 11
       LEAST_CONNECTIONS: Allocates requests to the instance with the least number of active
10 12
       connections.
11 13
     </li>
12
-    <li>
14
+    <li translate>
13 15
       ROUND_ROBIN: Rotates requests evenly between multiple instances.
14 16
     </li>
15
-    <li>
17
+    <li translate>
16 18
       SOURCE_IP: Requests from a unique source IP address are consistently directed to the same instance.
17 19
     </li>
18 20
   </ul>

+ 2
- 2
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html View File

@@ -25,8 +25,8 @@
25 25
 
26 26
     <div class="col-xs-12 col-sm-8 col-md-6">
27 27
       <div class="form-group required">
28
-        <label translate class="control-label" for="method">
29
-          Method
28
+        <label class="control-label" for="method">
29
+          <translate>Method</translate>
30 30
           <span class="hz-icon-required fa fa-asterisk"></span>
31 31
         </label>
32 32
         <select class="form-control" name="method" id="method"

Loading…
Cancel
Save