Updated strings for clarity

matomo-org · Nov 24, 2015 · 2ffaa0d · 2ffaa0d
1 parent 32dc6a3
commit 2ffaa0d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/angularjs/manage/edit.directive.html b/angularjs/manage/edit.directive.html
@@ -43,7 +43,7 @@ <h2>{{ 'CustomDimensions_ConfigureDimension'|translate:(dimensionScope|ucfirst):
                         <input type="text"
                                class="pattern"
                                ng-model="editDimension.dimension.extractions[index].pattern"
-                               placeholder="{{ editDimension.dimension.extractions[index].dimension === 'urlparam' ? 'urlparamname' : 'test(.*)' }}">
+                               placeholder="{{ editDimension.dimension.extractions[index].dimension === 'urlparam' ? 'url query string parameter' : 'eg. /blog/(.*)/' }}">
 
                         <span ng-click="editDimension.addExtraction()" class="icon-plus"></span>
                         <span ng-click="editDimension.removeExtraction(index)"

diff --git a/angularjs/manage/list.controller.js b/angularjs/manage/list.controller.js
@@ -12,6 +12,8 @@
     function CustomDimensionsListController(customDimensionsModel) {
         customDimensionsModel.fetchCustomDimensionsConfiguration();
 
+        this.siteName = piwik.siteName;
+
         this.model = customDimensionsModel;
     }
 })();
diff --git a/angularjs/manage/list.directive.html b/angularjs/manage/list.directive.html
@@ -1,7 +1,7 @@
 <div>
     <h2 piwik-enriched-headline>{{ 'CustomDimensions_CustomDimensions'|translate }}</h2>
 
-    <p ng-bind-html="'CustomDimensions_CustomDimensionsIntro'|translate:'':''">
+    <p ng-bind-html="('CustomDimensions_CustomDimensionsIntro'|translate:'':'':dimensionsList.siteName) + ' ' + ('CustomDimensions_CustomDimensionsIntroNext'|translate) ">
     </p>
 
     <p ng-show="dimensionsList.model.isLoading">
@@ -13,6 +13,7 @@ <h2 class="secondary"> {{ scope.name }} Dimensions </h2>
 
         <p>
             {{ 'CustomDimensions_ScopeDescription' + scope.name |translate }}
+            {{ 'CustomDimensions_ScopeDescription' + scope.name + 'MoreInfo' |translate }}
         </p>
 
         <table class="dataTable entityTable">

diff --git a/angularjs/manage/manage.directive.html b/angularjs/manage/manage.directive.html
@@ -13,7 +13,9 @@ <h2 class="secondary">{{ 'CustomDimensions_IncreaseAvailableCustomDimensionsTitl
         <pre><code>./console customdimensions:add-custom-dimension --scope=action
 ./console customdimensions:add-custom-dimension --scope=visit</code></pre>
         <p>
-            {{ 'CustomDimensions_HowToManyCreateCustomDimensions'|translate:5 }}
+            {{ 'CustomDimensions_HowToManyCreateCustomDimensions'|translate }}
+
+            {{ 'CustomDimensions_ExampleCreateCustomDimensions'|translate:5 }}
         </p>
         <pre><code>./console customdimensions:add-custom-dimension --scope=action --count=5</code></pre>
 

diff --git a/lang/en.json b/lang/en.json
@@ -1,19 +1,23 @@
 {
     "CustomDimensions": {
         "CustomDimensions": "Custom Dimensions",
-        "CustomDimensionsIntro": "By creating %sCustom Dimensions%s you can track any custom values and get first class reports including Segments and Widgets.",
-        "ScopeDescriptionVisit": "Custom Dimensions in scope 'Visit' can be sent along any tracking request and are stored directly to the visitor. If you set different values for a dimension during the lifetime of a visit, the last set value will be used.",
-        "ScopeDescriptionAction": "Custom Dimensions in scope 'Action' can be sent along any action.",
+        "CustomDimensionsIntro": "By creating %sCustom Dimensions%s you can collect any custom data for '%s'.",
+        "CustomDimensionsIntroNext": "Piwik will create a report for each Custom Dimension (including the conversion rate for each of your Goals), as well as let you easily segment your users based on these values.",
+        "ScopeDescriptionVisit": "Custom Dimensions in scope 'Visit' can be sent along any tracking request and are stored in the visit. ",
+        "ScopeDescriptionVisitMoreInfo": "If you set different values for a given dimension during the lifetime of a visit, the last value set will be used.",
+        "ScopeDescriptionAction": "Custom Dimensions in scope 'Action' can be sent along any action (page view, download, event, etc.).",
+        "ScopeDescriptionActionMoreInfo": "Extractions may be defined so that the custom dimension value is extracted from the Page URL, Page Title or a Page URL query parameter.",
         "IncreaseAvailableCustomDimensionsTitle": "Increase the number of available Custom Dimensions",
-        "IncreaseAvailableCustomDimensionsTakesLong": "Creating a new Custom Dimension can take a long time depending on the size of your database as it requires MySQL schema changes. Therefore it is only possible to do this via a command which needs to be executed on the command line.",
+        "IncreaseAvailableCustomDimensionsTakesLong": "Creating a new Custom Dimension can take a long time depending on the size of your database as it requires schema changes in your database. Therefore it is only possible to do this via a console command which needs to be executed on the command line.",
         "HowToCreateCustomDimension": "To create a new Custom Dimension execute the following command within your Piwik installation:",
-        "HowToManyCreateCustomDimensions": "If you want to create multiple new Custom Dimensions at once simply append the number of dimensions that shall be created. As all database changes will be executed in one statement, it may not take much longer to add multiple Custom Dimensions at once. For example to create %s new Custom Dimensions in scope action execute the following command:",
+        "HowToManyCreateCustomDimensions": "If you want to create multiple new Custom Dimensions at once, simply append the number of dimensions that shall be created. As all database changes will be executed in one statement, it may not take much longer to add multiple Custom Dimensions at once.",
+        "ExampleCreateCustomDimensions": "For example to create %s new Custom Dimensions in scope action execute the following command:",
         "HowToTrackManuallyTitle": "Tracking a value for this dimension manually",
         "HowToTrackManuallyViaJs": "To track a value in the JavaScript Tracker call:",
         "HowToTrackManuallyViaPhp": "To track a value in the PHP Tracker call:",
         "HowToTrackManuallyViaHttp": "To track a value via the HTTP Tracker API use the tracking parameter 'dimension' followed by the Custom Dimension Id:",
         "Extractions": "Extractions",
-        "ExtractionsHelp": "This is optional. A regex can be used to extract the value for this Custom Dimension from a URL, URL parameter or page title automatically. This way the value does not have to be set manually via a Tracking client. A value still can be set manually via the Piwik Tracker API. A manually set dimension value always takes precedence over an extraction. If multiple extractions are defined, the first extraction that matches is used.",
+        "ExtractionsHelp": "This is optional. A regex can be used to extract the value for this Custom Dimension from a page URL or page title automatically. This way, the custom dimension value does not have to be set manually via a Tracking client. A value still can be set manually via the Piwik Tracker API. Dimension values set manually in tracking clients always takes precedence over extractions. If multiple extractions are defined, the first extraction that matches is used.",
         "ExtractValue": "Extract value",
         "ExampleValue": "dimensionValue",
         "NoCustomDimensionConfigured": "No Custom Dimension configured yet, configure one now.",