Skip to content
Extraits de code Groupes Projets
Valider e65ced93 rédigé par BeezyT's avatar BeezyT
Parcourir les fichiers

Refs #2633 fixing impact of lang changes 

git-svn-id: http://dev.piwik.org/svn/trunk@5141 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 2dcb245f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
lang/en.php
+ 6
− 4
Voir le fichier @ e65ced93
...@@ -502,10 +502,12 @@ $translations = array( ...@@ -502,10 +502,12 @@ $translations = array(
'CoreUpdater_ExceptionArchiveIncomplete' => 'Archive is incomplete: some files are missing (eg. %s).', 'CoreUpdater_ExceptionArchiveIncomplete' => 'Archive is incomplete: some files are missing (eg. %s).',
'CustomVariables_PluginDescription' => 'Custom Variables are name,value pairs that you can set to a Visit using the Javascript API setVisitCustomVariables() function. Piwik will then report how many visits, pages, conversions for each of these custom names and values.', 'CustomVariables_PluginDescription' => 'Custom Variables are name,value pairs that you can set to a Visit using the Javascript API setVisitCustomVariables() function. Piwik will then report how many visits, pages, conversions for each of these custom names and values.',
'CustomVariables_CustomVariables' => 'Custom Variables', 'CustomVariables_CustomVariables' => 'Custom Variables',
'CustomVariables_ColumnCustomVariableName' => 'Custom Variable name (scope visit)', 'CustomVariables_ColumnCustomVariableName' => 'Custom Variable name',
'CustomVariables_ColumnCustomVariableValue' => 'Custom Variable value (scope visit)', 'CustomVariables_ColumnCustomVariableValue' => 'Custom Variable value',
'CustomVariables_ColumnCustomVariablePageName' => 'Custom Variable name (scope page)', 'CustomVariables_ColumnCustomVariablePageName' => 'Custom Variable name',
'CustomVariables_ColumnCustomVariablePageValue' => 'Custom Variable value (scope page)', 'CustomVariables_ColumnCustomVariablePageValue' => 'Custom Variable value',
'CustomVariables_ScopeVisit' => 'scope visit',
'CustomVariables_ScopePage' => 'scope page',
'CustomVariables_CustomVariablesReportDocumentation' => 'This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %s For more information about Custom Variables in general, read the %sCustom Variables documentation on piwik.org%s', 'CustomVariables_CustomVariablesReportDocumentation' => 'This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %s For more information about Custom Variables in general, read the %sCustom Variables documentation on piwik.org%s',
'Dashboard_PluginDescription' => 'Your Web Analytics Dashboard. You can customize Your Dashboard: add new widgets, change the order of your widgets. Each user can access his own custom Dashboard.', 'Dashboard_PluginDescription' => 'Your Web Analytics Dashboard. You can customize Your Dashboard: add new widgets, change the order of your widgets. Each user can access his own custom Dashboard.',
'Dashboard_Dashboard' => 'Dashboard', 'Dashboard_Dashboard' => 'Dashboard',
......
plugins/CustomVariables/CustomVariables.php
+ 8
− 4
Voir le fichier @ e65ced93
...@@ -80,28 +80,32 @@ class Piwik_CustomVariables extends Piwik_Plugin ...@@ -80,28 +80,32 @@ class Piwik_CustomVariables extends Piwik_Plugin
$segments[] = array( $segments[] = array(
'type' => 'dimension', 'type' => 'dimension',
'category' => 'CustomVariables_CustomVariables', 'category' => 'CustomVariables_CustomVariables',
'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableName').' '.$i, 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableName').' '.$i
.' ('.Piwik_Translate('CustomVariables_ScopeVisit').')',
'segment' => 'customVariableName'.$i, 'segment' => 'customVariableName'.$i,
'sqlSegment' => 'log_visit.custom_var_k'.$i, 'sqlSegment' => 'log_visit.custom_var_k'.$i,
); );
$segments[] = array( $segments[] = array(
'type' => 'dimension', 'type' => 'dimension',
'category' => 'CustomVariables_CustomVariables', 'category' => 'CustomVariables_CustomVariables',
'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue').' '.$i, 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue').' '.$i
.' ('.Piwik_Translate('CustomVariables_ScopeVisit').')',
'segment' => 'customVariableValue'.$i, 'segment' => 'customVariableValue'.$i,
'sqlSegment' => 'log_visit.custom_var_v'.$i, 'sqlSegment' => 'log_visit.custom_var_v'.$i,
); );
$segments[] = array( $segments[] = array(
'type' => 'dimension', 'type' => 'dimension',
'category' => 'CustomVariables_CustomVariables', 'category' => 'CustomVariables_CustomVariables',
'name' => Piwik_Translate('CustomVariables_ColumnCustomVariablePageName').' '.$i, 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableName').' '.$i
.' ('.Piwik_Translate('CustomVariables_ScopePage').')',
'segment' => 'customVariablePageName'.$i, 'segment' => 'customVariablePageName'.$i,
'sqlSegment' => 'log_link_visit_action.custom_var_k'.$i, 'sqlSegment' => 'log_link_visit_action.custom_var_k'.$i,
); );
$segments[] = array( $segments[] = array(
'type' => 'dimension', 'type' => 'dimension',
'category' => 'CustomVariables_CustomVariables', 'category' => 'CustomVariables_CustomVariables',
'name' => Piwik_Translate('CustomVariables_ColumnCustomVariablePageValue').' '.$i, 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue').' '.$i
.' ('.Piwik_Translate('CustomVariables_ScopePage').')',
'segment' => 'customVariablePageValue'.$i, 'segment' => 'customVariablePageValue'.$i,
'sqlSegment' => 'log_link_visit_action.custom_var_v'.$i, 'sqlSegment' => 'log_link_visit_action.custom_var_v'.$i,
); );
......
tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml
+ 1
− 1
Voir le fichier @ e65ced93
...@@ -691,7 +691,7 @@ ...@@ -691,7 +691,7 @@
<name>Custom Variables</name> <name>Custom Variables</name>
<module>CustomVariables</module> <module>CustomVariables</module>
<action>getCustomVariables</action> <action>getCustomVariables</action>
<dimension>Custom Variable name (scope visit)</dimension> <dimension>Custom Variable name</dimension>
<documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. &lt;br /&gt; For more information about Custom Variables in general, read the &lt;a href=&quot;http://piwik.org/docs/custom-variables/&quot; target=&quot;_blank&quot;&gt;Custom Variables documentation on piwik.org&lt;/a&gt;</documentation> <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. &lt;br /&gt; For more information about Custom Variables in general, read the &lt;a href=&quot;http://piwik.org/docs/custom-variables/&quot; target=&quot;_blank&quot;&gt;Custom Variables documentation on piwik.org&lt;/a&gt;</documentation>
<metrics> <metrics>
<nb_visits>Visits</nb_visits> <nb_visits>Visits</nb_visits>
......
tests/integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+ 36
− 36
Voir le fichier @ e65ced93
...@@ -172,121 +172,121 @@ ...@@ -172,121 +172,121 @@
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope page) 1</name> <name>Custom Variable name 1 (scope page)</name>
<segment>customVariablePageName1</segment> <segment>customVariablePageName1</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope page) 2</name> <name>Custom Variable name 1 (scope visit)</name>
<segment>customVariablePageName2</segment> <segment>customVariableName1</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope page) 3</name> <name>Custom Variable name 2 (scope page)</name>
<segment>customVariablePageName3</segment> <segment>customVariablePageName2</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope page) 4</name> <name>Custom Variable name 2 (scope visit)</name>
<segment>customVariablePageName4</segment> <segment>customVariableName2</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope page) 5</name> <name>Custom Variable name 3 (scope page)</name>
<segment>customVariablePageName5</segment> <segment>customVariablePageName3</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope visit) 1</name> <name>Custom Variable name 3 (scope visit)</name>
<segment>customVariableName1</segment> <segment>customVariableName3</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope visit) 2</name> <name>Custom Variable name 4 (scope page)</name>
<segment>customVariableName2</segment> <segment>customVariablePageName4</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope visit) 3</name> <name>Custom Variable name 4 (scope visit)</name>
<segment>customVariableName3</segment> <segment>customVariableName4</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope visit) 4</name> <name>Custom Variable name 5 (scope page)</name>
<segment>customVariableName4</segment> <segment>customVariablePageName5</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope visit) 5</name> <name>Custom Variable name 5 (scope visit)</name>
<segment>customVariableName5</segment> <segment>customVariableName5</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope page) 1</name> <name>Custom Variable value 1 (scope page)</name>
<segment>customVariablePageValue1</segment> <segment>customVariablePageValue1</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope page) 2</name> <name>Custom Variable value 1 (scope visit)</name>
<segment>customVariablePageValue2</segment> <segment>customVariableValue1</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope page) 3</name> <name>Custom Variable value 2 (scope page)</name>
<segment>customVariablePageValue3</segment> <segment>customVariablePageValue2</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope page) 4</name> <name>Custom Variable value 2 (scope visit)</name>
<segment>customVariablePageValue4</segment> <segment>customVariableValue2</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope page) 5</name> <name>Custom Variable value 3 (scope page)</name>
<segment>customVariablePageValue5</segment> <segment>customVariablePageValue3</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope visit) 1</name> <name>Custom Variable value 3 (scope visit)</name>
<segment>customVariableValue1</segment> <segment>customVariableValue3</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope visit) 2</name> <name>Custom Variable value 4 (scope page)</name>
<segment>customVariableValue2</segment> <segment>customVariablePageValue4</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope visit) 3</name> <name>Custom Variable value 4 (scope visit)</name>
<segment>customVariableValue3</segment> <segment>customVariableValue4</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope visit) 4</name> <name>Custom Variable value 5 (scope page)</name>
<segment>customVariableValue4</segment> <segment>customVariablePageValue5</segment>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope visit) 5</name> <name>Custom Variable value 5 (scope visit)</name>
<segment>customVariableValue5</segment> <segment>customVariableValue5</segment>
</row> </row>
<row> <row>
......
tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml
+ 1
− 1
Voir le fichier @ e65ced93
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
<name>Custom Variables</name> <name>Custom Variables</name>
<module>CustomVariables</module> <module>CustomVariables</module>
<action>getCustomVariables</action> <action>getCustomVariables</action>
<dimension>Custom Variable name (scope visit)</dimension> <dimension>Custom Variable name</dimension>
<documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. &lt;br /&gt; For more information about Custom Variables in general, read the &lt;a href=&quot;http://piwik.org/docs/custom-variables/&quot; target=&quot;_blank&quot;&gt;Custom Variables documentation on piwik.org&lt;/a&gt;</documentation> <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. &lt;br /&gt; For more information about Custom Variables in general, read the &lt;a href=&quot;http://piwik.org/docs/custom-variables/&quot; target=&quot;_blank&quot;&gt;Custom Variables documentation on piwik.org&lt;/a&gt;</documentation>
<metrics> <metrics>
<nb_visits>Visits</nb_visits> <nb_visits>Visits</nb_visits>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter