diff --git a/ChangeLog b/ChangeLog index 12e18c4..3ed3367 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2 (13/01/2015) +v0.2 (19/02/2015) ** User ** Add referers_diff display plugin Add year statistics in month details @@ -6,6 +6,8 @@ v0.2 (13/01/2015) Add browsers detection Add operating systems detection Add track users plugin + Add feeds plugin + Add _append feature to conf.py ** Dev ** Add istats_diff interface diff --git a/docs/index.md b/docs/index.md index 941675c..26b1acd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -565,12 +565,15 @@ plugins.post_analysis.feeds Post analysis hook Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + If there is ony one hit per day to a feed, merge feeds parsers with the same user agent + as it must be the same person with a different IP address. Plugin requirements : None Conf values needed : feeds + merge_one_hit_only_feeds_parsers* Output files : None diff --git a/docs/modules.md b/docs/modules.md index 44d4d52..6c413b8 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -473,12 +473,15 @@ plugins.post_analysis.feeds Post analysis hook Find feeds parsers (first hit in feeds conf value and no viewed pages if it's a robot) + If there is ony one hit per day to a feed, merge feeds parsers with the same user agent + as it must be the same person with a different IP address. Plugin requirements : None Conf values needed : feeds + merge_one_hit_only_feeds_parsers* Output files : None diff --git a/iwla.pot b/iwla.pot index fb23cd8..7d0e09a 100644 --- a/iwla.pot +++ b/iwla.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-02-17 19:31+CET\n" +"POT-Creation-Date: 2015-02-19 20:27+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,11 +35,11 @@ msgstr "" msgid "March" msgstr "" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "June" msgstr "" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "May" msgstr "" @@ -67,135 +67,135 @@ msgstr "" msgid "Ratio" msgstr "" -#: iwla.py:383 +#: iwla.py:381 msgid "Statistics" msgstr "" -#: iwla.py:391 +#: iwla.py:389 msgid "By day" msgstr "" -#: iwla.py:391 +#: iwla.py:389 msgid "Day" msgstr "" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Not viewed Bandwidth" msgstr "" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Visits" msgstr "" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 #: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 msgid "Hits" msgstr "" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 #: plugins/display/track_users.py:112 msgid "Pages" msgstr "" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "" -#: iwla.py:428 +#: iwla.py:426 msgid "Average" msgstr "" -#: iwla.py:433 iwla.py:478 +#: iwla.py:431 iwla.py:476 msgid "Total" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Apr" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Aug" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Dec" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Feb" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Jan" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Jul" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Mar" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Nov" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Oct" msgstr "" -#: iwla.py:442 +#: iwla.py:440 msgid "Sep" msgstr "" -#: iwla.py:443 +#: iwla.py:441 msgid "Summary" msgstr "" -#: iwla.py:444 +#: iwla.py:442 msgid "Month" msgstr "" -#: iwla.py:444 +#: iwla.py:442 msgid "Visitors" msgstr "" -#: iwla.py:444 iwla.py:456 plugins/display/feeds.py:92 +#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:97 #: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 msgid "Details" msgstr "" -#: iwla.py:492 +#: iwla.py:490 msgid "Statistics for" msgstr "" -#: iwla.py:499 +#: iwla.py:497 msgid "Last update" msgstr "" -#: iwla.py:503 +#: iwla.py:501 msgid "Time analysis" msgstr "" -#: iwla.py:505 +#: iwla.py:503 msgid "hours" msgstr "" -#: iwla.py:506 +#: iwla.py:504 msgid "minutes" msgstr "" -#: iwla.py:506 +#: iwla.py:504 msgid "seconds" msgstr "" -#: plugins/display/all_visits.py:70 plugins/display/feeds.py:76 +#: plugins/display/all_visits.py:70 plugins/display/feeds.py:75 #: plugins/display/top_visitors.py:72 msgid "Host" msgstr "" @@ -243,15 +243,23 @@ msgstr "" msgid "All Browsers" msgstr "" -#: plugins/display/feeds.py:76 +#: plugins/display/feeds.py:69 +msgid "All Feeds parsers" +msgstr "" + +#: plugins/display/feeds.py:75 msgid "All feeds parsers" msgstr "" #: plugins/display/feeds.py:90 +msgid "Merged feeds parsers" +msgstr "" + +#: plugins/display/feeds.py:95 msgid "Feeds parsers" msgstr "" -#: plugins/display/feeds.py:97 +#: plugins/display/feeds.py:102 msgid "Found" msgstr "" diff --git a/locales/fr_FR/LC_MESSAGES/iwla.mo b/locales/fr_FR/LC_MESSAGES/iwla.mo index bfbe860..1f79662 100644 Binary files a/locales/fr_FR/LC_MESSAGES/iwla.mo and b/locales/fr_FR/LC_MESSAGES/iwla.mo differ diff --git a/locales/fr_FR/LC_MESSAGES/iwla.pot b/locales/fr_FR/LC_MESSAGES/iwla.pot index d2ef0c9..182d246 100644 --- a/locales/fr_FR/LC_MESSAGES/iwla.pot +++ b/locales/fr_FR/LC_MESSAGES/iwla.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: iwla\n" -"POT-Creation-Date: 2015-02-17 19:31+CET\n" -"PO-Revision-Date: 2015-02-17 19:32+0100\n" +"POT-Creation-Date: 2015-02-19 20:27+CET\n" +"PO-Revision-Date: 2015-02-19 20:28+0100\n" "Last-Translator: Soutadé \n" "Language-Team: iwla\n" "Language: fr_FR\n" @@ -37,11 +37,11 @@ msgstr "Juillet" msgid "March" msgstr "Mars" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "June" msgstr "Juin" -#: display.py:32 iwla.py:442 +#: display.py:32 iwla.py:440 msgid "May" msgstr "Mai" @@ -69,135 +69,135 @@ msgstr "Septembre" msgid "Ratio" msgstr "Pourcentage" -#: iwla.py:383 +#: iwla.py:381 msgid "Statistics" msgstr "Statistiques" -#: iwla.py:391 +#: iwla.py:389 msgid "By day" msgstr "Par jour" -#: iwla.py:391 +#: iwla.py:389 msgid "Day" msgstr "Jour" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Not viewed Bandwidth" msgstr "Traffic non vu" -#: iwla.py:391 iwla.py:444 +#: iwla.py:389 iwla.py:442 msgid "Visits" msgstr "Visites" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_downloads.py:97 #: plugins/display/top_visitors.py:72 plugins/display/track_users.py:112 msgid "Hits" msgstr "Hits" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 -#: plugins/display/feeds.py:76 plugins/display/referers.py:95 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 +#: plugins/display/feeds.py:75 plugins/display/referers.py:95 #: plugins/display/referers.py:153 plugins/display/top_visitors.py:72 #: plugins/display/track_users.py:112 msgid "Pages" msgstr "Pages" -#: iwla.py:391 iwla.py:444 plugins/display/all_visits.py:70 +#: iwla.py:389 iwla.py:442 plugins/display/all_visits.py:70 #: plugins/display/top_visitors.py:72 msgid "Bandwidth" msgstr "Bande passante" -#: iwla.py:428 +#: iwla.py:426 msgid "Average" msgstr "Moyenne" -#: iwla.py:433 iwla.py:478 +#: iwla.py:431 iwla.py:476 msgid "Total" msgstr "Total" -#: iwla.py:442 +#: iwla.py:440 msgid "Apr" msgstr "Avr" -#: iwla.py:442 +#: iwla.py:440 msgid "Aug" msgstr "Août" -#: iwla.py:442 +#: iwla.py:440 msgid "Dec" msgstr "Déc" -#: iwla.py:442 +#: iwla.py:440 msgid "Feb" msgstr "Fév" -#: iwla.py:442 +#: iwla.py:440 msgid "Jan" msgstr "Jan" -#: iwla.py:442 +#: iwla.py:440 msgid "Jul" msgstr "Jui" -#: iwla.py:442 +#: iwla.py:440 msgid "Mar" msgstr "Mars" -#: iwla.py:442 +#: iwla.py:440 msgid "Nov" msgstr "Nov" -#: iwla.py:442 +#: iwla.py:440 msgid "Oct" msgstr "Oct" -#: iwla.py:442 +#: iwla.py:440 msgid "Sep" msgstr "Sep" -#: iwla.py:443 +#: iwla.py:441 msgid "Summary" msgstr "Résumé" -#: iwla.py:444 +#: iwla.py:442 msgid "Month" msgstr "Mois" -#: iwla.py:444 +#: iwla.py:442 msgid "Visitors" msgstr "Visiteurs" -#: iwla.py:444 iwla.py:456 plugins/display/feeds.py:92 +#: iwla.py:442 iwla.py:454 plugins/display/feeds.py:97 #: plugins/display/operating_systems.py:90 plugins/display/track_users.py:107 msgid "Details" msgstr "Détails" -#: iwla.py:492 +#: iwla.py:490 msgid "Statistics for" msgstr "Statistiques pour" -#: iwla.py:499 +#: iwla.py:497 msgid "Last update" msgstr "Dernière mise à jour" -#: iwla.py:503 +#: iwla.py:501 msgid "Time analysis" msgstr "Durée de l'analyse" -#: iwla.py:505 +#: iwla.py:503 msgid "hours" msgstr "heures " -#: iwla.py:506 +#: iwla.py:504 msgid "minutes" msgstr "minutes" -#: iwla.py:506 +#: iwla.py:504 msgid "seconds" msgstr "secondes" -#: plugins/display/all_visits.py:70 plugins/display/feeds.py:76 +#: plugins/display/all_visits.py:70 plugins/display/feeds.py:75 #: plugins/display/top_visitors.py:72 msgid "Host" msgstr "Hôte" @@ -245,15 +245,23 @@ msgstr "Autres" msgid "All Browsers" msgstr "Tous les navigateurs" -#: plugins/display/feeds.py:76 +#: plugins/display/feeds.py:69 +msgid "All Feeds parsers" +msgstr "Tous les agrégateurs" + +#: plugins/display/feeds.py:75 msgid "All feeds parsers" msgstr "Tous les agrégateurs" #: plugins/display/feeds.py:90 +msgid "Merged feeds parsers" +msgstr "Agrégateurs fusionnés" + +#: plugins/display/feeds.py:95 msgid "Feeds parsers" msgstr "Agrégateurs" -#: plugins/display/feeds.py:97 +#: plugins/display/feeds.py:102 msgid "Found" msgstr "Trouvé"