Index: src/main/resources/Stats/AllTimeActivity.xml =================================================================== --- src/main/resources/Stats/AllTimeActivity.xml (revision 16224) +++ src/main/resources/Stats/AllTimeActivity.xml (working copy) @@ -14,7 +14,7 @@ 1195803878000 1208532894000 1208532894000 -2.1 +1.1 @@ -97,7 +97,7 @@ Information -#panelheader('All Time Activity') +#panelheader($msg.get("xe.statistics.alltime.caps")) #if($xwiki.statsService.enabled) #if(not $chartWidth) #set($chartWidth=250) @@ -110,7 +110,7 @@ #set($periodStart=$xwiki.jodatime.getDateTime($currentYear.start).minusYears(2)) #set($periodEnd=$xwiki.jodatime.getDateTime($currentYear.end).plusYears(2)) #set($dtf=$xwiki.jodatime.getDateTimeFormatterForPattern($pattern)) -<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:3;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:yyyy|domain_axis_lower_date=value:$dtf.print($periodStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($periodEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:year;count:1|domain_axis_tick_mark_position:ende|title=All Time Activity}</div> +<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:3;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:yyyy|domain_axis_lower_date=value:$dtf.print($periodStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($periodEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:year;count:1|domain_axis_tick_mark_position:ende|title=${msg.get("xe.statistics.alltime.caps")}}</div> #else #printStatisticsDisabled() #end Index: src/main/resources/Stats/MostReferredPages.xml =================================================================== --- src/main/resources/Stats/MostReferredPages.xml (revision 16224) +++ src/main/resources/Stats/MostReferredPages.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader('Most Referred Pages') +#panelheader($msg.get("xe.statistics.pages.mostreferred")) #if($xwiki.statsService.enabled) #set($scope=$xwiki.criteriaService.scopeFactory.ALL_PAGES) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) Index: src/main/resources/Stats/MostActiveContributors.xml =================================================================== --- src/main/resources/Stats/MostActiveContributors.xml (revision 16224) +++ src/main/resources/Stats/MostActiveContributors.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader('Most Active Contributors') +#panelheader($msg.get("xe.statistics.contributors.mostactive")) #if($xwiki.statsService.enabled) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) #set($interval=$xwiki.criteriaService.rangeFactory.createHeadRange(5)) Index: src/main/resources/Stats/Activity.xml =================================================================== --- src/main/resources/Stats/Activity.xml (revision 16224) +++ src/main/resources/Stats/Activity.xml (working copy) @@ -54,7 +54,7 @@ -1 Activity Statistics +1 $msg.get("xe.statistics.activity") #if($xwiki.statsService.enabled) #set($chartWidth = 380) Index: src/main/resources/Stats/CurrentWeekActivity.xml =================================================================== --- src/main/resources/Stats/CurrentWeekActivity.xml (revision 16224) +++ src/main/resources/Stats/CurrentWeekActivity.xml (working copy) @@ -14,7 +14,7 @@ 1195803878000 1208532741000 1208532741000 -4.1 +1.1 @@ -97,7 +97,7 @@ Information -#panelheader('Current Week Activity') +#panelheader($msg.get("xe.statistics.current.week.caps")) #if($xwiki.statsService.enabled) #if(not $chartWidth) #set($chartWidth=250) @@ -107,10 +107,10 @@ #end #set($pattern='yyyy.MM.dd') #set($currentWeek=$xwiki.criteriaService.periodFactory.currentWeek) -#set($weekStart=$xwiki.jodatime.getDateTime($currentWeek.start)) -#set($weekEnd=$xwiki.jodatime.getDateTime($currentWeek.end)) +#set($weekStart=$!xwiki.jodatime.getDateTime($currentWeek.start)) +#set($weekEnd=$!xwiki.jodatime.getDateTime($currentWeek.end)) #set($dtf=$xwiki.jodatime.getDateTimeFormatterForPattern($pattern)) -<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:0;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:MMM dd|domain_axis_lower_date=value:$dtf.print($weekStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($weekEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:day;count:1|domain_axis_tick_mark_position:ende|title=Current Week Activity}</div> +<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:0;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:MMM dd|domain_axis_lower_date=value:$dtf.print($weekStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($weekEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:day;count:1|domain_axis_tick_mark_position:ende|title=${msg.get("xe.statistics.current.week.caps")}}</div> #else #printStatisticsDisabled() #end Index: src/main/resources/Stats/MostViewedSpaces.xml =================================================================== --- src/main/resources/Stats/MostViewedSpaces.xml (revision 16224) +++ src/main/resources/Stats/MostViewedSpaces.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader('Most Viewed Spaces') +#panelheader($msg.get("xe.statistics.spaces.mostviewed")) #if($xwiki.statsService.enabled) #set($scope=$xwiki.criteriaService.scopeFactory.ALL_SPACES) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) Index: src/main/resources/Stats/MostEditedSpaces.xml =================================================================== --- src/main/resources/Stats/MostEditedSpaces.xml (revision 16224) +++ src/main/resources/Stats/MostEditedSpaces.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader('Most Edited Spaces') +#panelheader($msg.get("xe.statistics.spaces.mostedited")) #if($xwiki.statsService.enabled) #set($scope=$xwiki.criteriaService.scopeFactory.ALL_SPACES) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) Index: src/main/resources/Stats/Referrer.xml =================================================================== --- src/main/resources/Stats/Referrer.xml (revision 16224) +++ src/main/resources/Stats/Referrer.xml (working copy) @@ -54,7 +54,7 @@ -1 Referrer Statistics +1 $msg.get("xe.statistics.referrerstats") #if($xwiki.statsService.enabled) #displayPanelLayout(2 ["Stats.BestReferrers", "Stats.MostReferredPages"]) Index: src/main/resources/Stats/MostEditedPages.xml =================================================================== --- src/main/resources/Stats/MostEditedPages.xml (revision 16224) +++ src/main/resources/Stats/MostEditedPages.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader("Most Edited Pages") +#panelheader($msg.get("xe.statistics.pages.mostedited")) #if($xwiki.statsService.enabled) #set($scope=$xwiki.criteriaService.scopeFactory.ALL_PAGES) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) Index: src/main/resources/Stats/MostViewedPages.xml =================================================================== --- src/main/resources/Stats/MostViewedPages.xml (revision 16224) +++ src/main/resources/Stats/MostViewedPages.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader("Most Viewed Pages") +#panelheader($msg.get("xe.statistics.pages.mostviewed")) #if($xwiki.statsService.enabled) #set($scope=$xwiki.criteriaService.scopeFactory.ALL_PAGES) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) Index: src/main/resources/Stats/Document.xml =================================================================== --- src/main/resources/Stats/Document.xml (revision 16224) +++ src/main/resources/Stats/Document.xml (working copy) @@ -54,7 +54,7 @@ -1 Document Statistics +1 $msg.get("xe.statistics.document") #if($xwiki.statsService.enabled) #displayPanelLayout(2 ["Stats.MostViewedPages", "Stats.MostEditedPages", "Stats.MostViewedSpaces", "Stats.MostEditedSpaces"]) Index: src/main/resources/Stats/WebHome.xml =================================================================== --- src/main/resources/Stats/WebHome.xml (revision 16224) +++ src/main/resources/Stats/WebHome.xml (working copy) @@ -54,23 +54,26 @@ -1 Statistics +1 $msg.get("xe.statistics") #if($xwiki.statsService.enabled) #set($chartWidth = 380) #displayPanelLayout(2 ["Stats.MostViewedPages", "Stats.MostActiveContributors", "Stats.CurrentMonthActivity", "Stats.MostReferredPages"]) -#info("For more statistics see [Document Statistics>Stats.Document], [Visit Statistics>Stats.Visit], [Activity Statistics>Stats.Activity] and [Referrer Statistics>Stats.Referrer].") +$msg.get("xe.statistics.more") +* [$msg.get("xe.statistics.document")>Stats.Document] +* [$msg.get("xe.statistics.visit")>Stats.Visit] +* [$msg.get("xe.statistics.activity")>Stats.Activity] +* [$msg.get("xe.statistics.referrer")>Stats.Referrer] #else -#warning(" -The statistics module is disabled by default for improved performances. It can be globally activated by setting the value of *<tt>xwiki.stats</tt>* to *<tt>1</tt>* in the *<tt>xwiki.cfg</tt>* configuration file. For more details, see [xwiki.org>http://www.xwiki.org]. +#warning($msg.get("xe.statistics.module.disabled")) -Activating the statistics module makes the following information available to you: +$msg.get("xe.statistics.module.settingvalue") *<tt>xwiki.stats</tt>* $msg.get("xe.statistics.to") *<tt>1</tt>* $msg.get("xe.statistics.inthe") *<tt>xwiki.cfg</tt>* $msg.get("xe.statistics.moredetails") [xwiki.org>http://www.xwiki.org]. -* Most edited pages -* Most active users -* Current month activity -* Most referred pages -* and much more! -") +$msg.get("xe.statistics.module.activating") + +* $msg.get("xe.statistics.pages.mostedited") +* $msg.get("xe.statistics.contributors.mostactive") +* $msg.get("xe.statistics.pages.mostreferred") +* $msg.get("xe.statistics.module.muchmore") #end Index: src/main/resources/Stats/CurrentYearActivity.xml =================================================================== --- src/main/resources/Stats/CurrentYearActivity.xml (revision 16224) +++ src/main/resources/Stats/CurrentYearActivity.xml (working copy) @@ -14,7 +14,7 @@ 1195803878000 1208532872000 1208532872000 -2.1 +1.1 @@ -97,7 +97,7 @@ Information -#panelheader('Current Year Activity') +#panelheader($msg.get("xe.statistics.current.year.caps")) #if($xwiki.statsService.enabled) #if(not $chartWidth) #set($chartWidth=250) @@ -107,10 +107,10 @@ #end #set($pattern='yyyy.MM') #set($currentYear=$xwiki.criteriaService.periodFactory.currentYear) -#set($yearStart=$xwiki.jodatime.getDateTime($currentYear.start)) -#set($yearEnd=$xwiki.jodatime.getDateTime($currentYear.end)) +#set($yearStart=$!xwiki.jodatime.getDateTime($currentYear.start)) +#set($yearEnd=$!xwiki.jodatime.getDateTime($currentYear.end)) #set($dtf=$xwiki.jodatime.getDateTimeFormatterForPattern($pattern)) -<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:2;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:MM|domain_axis_lower_date=value:$dtf.print($yearStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($yearEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:month;count:1|domain_axis_tick_mark_position:ende|title=Current Year Activity}</div> +<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:2;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:MM|domain_axis_lower_date=value:$dtf.print($yearStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($yearEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:month;count:1|domain_axis_tick_mark_position:ende|title=${msg.get("xe.statistics.current.year.caps")}}</div> #else #printStatisticsDisabled() #end Index: src/main/resources/Stats/ActivityData.xml =================================================================== --- src/main/resources/Stats/ActivityData.xml (revision 16224) +++ src/main/resources/Stats/ActivityData.xml (working copy) @@ -55,7 +55,7 @@ #if($xwiki.statsService.enabled) -1 Current week activity +1 $msg.get("xe.statistics.current.week") #set($scope = $xwiki.criteriaService.scopeFactory.ALL) #set($period = $xwiki.criteriaService.periodFactory.currentWeek) @@ -64,17 +64,17 @@ #set($myedits = $xwiki.statsService.getActionStatistics('save', $scope, $period, $step)) #set($dtf = $xwiki.jodatime.getDateTimeFormatterForPattern('yyyy.MM.dd')) {table} -| Views | Edits +| $msg.get("xe.statistics.views") | $msg.get("xe.statistics.edits") #if($myviews.size() > 0) #foreach($item in $myviews.entrySet()) -$dtf.print($item.key) | $item.value | $myedits.get($item.key) +$!dtf.print($item.key) | $item.value | $myedits.get($item.key) #end #else 1900.01.01 | 0 | 0 #end {table} -1 Current month activity +1 $msg.get("xe.statistics.current.month") #set($period = $xwiki.criteriaService.periodFactory.currentMonth) #set($step = $xwiki.criteriaService.durationFactory.DAY) @@ -82,17 +82,17 @@ #set($myedits = $xwiki.statsService.getActionStatistics('save', $scope, $period, $step)) #set($dtf = $xwiki.jodatime.getDateTimeFormatterForPattern('yyyy.MM.dd')) {table} -| Views | Edits +| $msg.get("xe.statistics.views") | $msg.get("xe.statistics.edits") #if($myviews.size() > 0) #foreach($item in $myviews.entrySet()) -$dtf.print($item.key) | $item.value | $myedits.get($item.key) +$!dtf.print($item.key) | $item.value | $myedits.get($item.key) #end #else 1900.01.01 | 0 | 0 #end {table} -1 Current year activity +1 $msg.get("xe.statistics.current.year") #set($period = $xwiki.criteriaService.periodFactory.currentYear) #set($step = $xwiki.criteriaService.durationFactory.MONTH) @@ -100,17 +100,17 @@ #set($myedits = $xwiki.statsService.getActionStatistics('save', $scope, $period, $step)) #set($dtf = $xwiki.jodatime.getDateTimeFormatterForPattern('yyyy.MM')) {table} -| Views | Edits +| $msg.get("xe.statistics.views") | $msg.get("xe.statistics.edits") #if($myviews.size() > 0) #foreach($item in $myviews.entrySet()) -$dtf.print($item.key) | $item.value | $myedits.get($item.key) +$!dtf.print($item.key) | $item.value | $myedits.get($item.key) #end #else 1900.01 | 0 | 0 #end {table} -1 All time activity +1 $msg.get("xe.statistics.alltime") #set($period = $xwiki.criteriaService.periodFactory.createPeriod('20060101', '20090101')) #set($step = $xwiki.criteriaService.durationFactory.YEAR) @@ -118,10 +118,10 @@ #set($myedits = $xwiki.statsService.getActionStatistics('save', $scope, $period, $step)) #set($dtf = $xwiki.jodatime.getDateTimeFormatterForPattern('yyyy')) {table} -| Views | Edits +| $msg.get("xe.statistics.views") | $msg.get("xe.statistics.edits") #if($myviews.size() > 0) #foreach($item in $myviews.entrySet()) -$dtf.print($item.key) | $item.value | $myedits.get($item.key) +$!dtf.print($item.key) | $item.value | $myedits.get($item.key) #end #else 1900 | 0 | 0 Index: src/main/resources/Stats/BestReferrers.xml =================================================================== --- src/main/resources/Stats/BestReferrers.xml (revision 16224) +++ src/main/resources/Stats/BestReferrers.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader('Best Referrers') +#panelheader($msg.get("xe.statistics.bestreferrers")) #if($xwiki.statsService.enabled) #set($scope=$xwiki.criteriaService.scopeFactory.ALL_PAGES) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) Index: src/main/resources/Stats/Visit.xml =================================================================== --- src/main/resources/Stats/Visit.xml (revision 16224) +++ src/main/resources/Stats/Visit.xml (working copy) @@ -54,7 +54,7 @@ -1 Visit Statistics +1 $msg.get("xe.statistics.visit") #if($xwiki.statsService.enabled) #displayPanelLayout(2 ["Stats.MostActiveContributors", "Stats.LeastActiveContributors"]) Index: src/main/resources/Stats/LeastActiveContributors.xml =================================================================== --- src/main/resources/Stats/LeastActiveContributors.xml (revision 16224) +++ src/main/resources/Stats/LeastActiveContributors.xml (working copy) @@ -97,7 +97,7 @@ Information -#panelheader('Least Active Contributors') +#panelheader($msg.get("xe.statistics.contributors.leastactive")) #if($xwiki.statsService.enabled) #set($period=$xwiki.criteriaService.periodFactory.ALL_TIME) #set($interval=$xwiki.criteriaService.rangeFactory.createTailRange(5)) Index: src/main/resources/Stats/CurrentMonthActivity.xml =================================================================== --- src/main/resources/Stats/CurrentMonthActivity.xml (revision 16224) +++ src/main/resources/Stats/CurrentMonthActivity.xml (working copy) @@ -14,7 +14,7 @@ 1195803878000 1208532771000 1208532771000 -4.1 +1.1 @@ -97,7 +97,7 @@ Information -#panelheader('Current Month Activity') +#panelheader($msg.get("xe.statistics.current.month.caps")) #if($xwiki.statsService.enabled) #if(not $chartWidth) #set($chartWidth=250) @@ -107,10 +107,10 @@ #end #set($pattern='yyyy.MM.dd') #set($currentMonth=$xwiki.criteriaService.periodFactory.currentMonth) -#set($monthStart=$xwiki.jodatime.getDateTime($currentMonth.start)) -#set($monthEnd=$xwiki.jodatime.getDateTime($currentMonth.end)) +#set($monthStart=$!xwiki.jodatime.getDateTime($currentMonth.start)) +#set($monthEnd=$!xwiki.jodatime.getDateTime($currentMonth.end)) #set($dtf=$xwiki.jodatime.getDateTimeFormatterForPattern($pattern)) -<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:1;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:dd|domain_axis_lower_date=value:$dtf.print($monthStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($monthEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:day;count:3|domain_axis_tick_mark_position:ende|title=Current Month Activity}</div> +<div style="text-align:center;">{chart:type=time|source=type:table;doc:Stats.ActivityData;table_number:1;ignore_alpha:true|date_format=type:custom;pattern:$pattern|height=$chartHeight|width=$chartWidth|domain_axis_date_format_override=type:custom;pattern:dd|domain_axis_lower_date=value:$dtf.print($monthStart);type:custom;pattern:$pattern|domain_axis_upper_date=value:$dtf.print($monthEnd);type:custom;pattern:$pattern|domain_axis_date_tick_unit=unit:day;count:3|domain_axis_tick_mark_position:ende|title=${msg.get("xe.statistics.current.month.caps")}}</div> #else #printStatisticsDisabled() #end Index: src/main/resources/Stats/Macros.xml =================================================================== --- src/main/resources/Stats/Macros.xml (revision 16224) +++ src/main/resources/Stats/Macros.xml (working copy) @@ -59,10 +59,11 @@ <table class="stats" cellspacing="0" cellpadding="0"> <thead> <tr> -<th class="numeric" style="width:20%">Hits</th> -<th style="width:40%">Page</th> -<th style="width:40%">Space</th> +<th class="numeric" style="width:20%">$msg.get("xe.statistics.hits")</th> +<th style="width:40%">$msg.get("xe.statistics.page")</th> +<th style="width:40%">$msg.get("xe.statistics.space")</th> </tr> + </thead> <tbody> #foreach($item in $stats) @@ -83,8 +84,8 @@ <table class="stats" cellspacing="0" cellpadding="0"> <thead> <tr> -<th class="numeric" style="width:20%">Hits</th> -<th style="width:80%">Space</th> +<th class="numeric" style="width:20%">$msg.get("xe.statistics.hits")</th> +<th style="width:80%">$msg.get("xe.statistics.space")</th> </tr></thead> <tbody> #foreach($item in $stats) @@ -101,8 +102,8 @@ <table class="stats" cellspacing="0" cellpadding="0"> <thead> <tr> -<th class="numeric" style="width:20%">Changes</th> -<th style="width:80%">User</th> +<th class="numeric" style="width:20%">$msg.get("xe.statistics.changes")</th> +<th style="width:80%">$msg.get("xe.statistics.user")</th> </tr> </thead> <tbody> @@ -124,8 +125,8 @@ <table class="stats" cellspacing="0" cellpadding="0"> <thead> <tr> -<th class="numeric" style="width:20%">Sources</th> -<th style="width:80%">Referrer</th> +<th class="numeric" style="width:20%">$msg.get("xe.statistics.sources")</th> +<th style="width:80%">$msg.get("xe.statistics.referrer")</th> </tr> </thead> <tbody> @@ -139,9 +140,10 @@ </table> #end #macro(printNoStatisticsData) -#info('No statistics recorded') +#info($msg.get("xe.statistics.notrecorded")) #end #macro(printStatisticsDisabled) -#warning('The statistics module is disabled by default for improved performances. For more details, see [statistics home page>Stats.WebHome].') +#set($statsHome = "[$msg.get('xe.statistics.homepage')>Stats.WebHome].") +#warning($msg.get("xe.statistics.disabled", [$statsHome])) #end