diff --git a/locale/en.json b/locale/en.json index 193d939..6c43849 100644 --- a/locale/en.json +++ b/locale/en.json @@ -15,7 +15,7 @@ "Framadate was initially based on ": "DateChaprilOrg is a Framadate initially based on ", "It is governed by the": "It is licensed under the", "The software": "The software", - "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "This software needs JavaScript and cookies enabled. It is compatible with the following web browsers:", + "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "This software needs JavaScript and cookies enabled. It is compatible with the usuals web browsers", "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "software developed by the University of Strasbourg. These days, it is developed by the Framasoft association." }, "3rd section": { diff --git a/locale/fr.json b/locale/fr.json index 53d0e18..8a9681f 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -15,7 +15,7 @@ "Framadate was initially based on ": "DateChaprilOrg est un Framadate initialement basé sur ", "It is governed by the": "Il est régi par la", "The software": "Le logiciel", - "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "Ce logiciel requiert l’activation du JavaScript et des cookies. Il est compatible avec les navigateurs web suivants :", + "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "Ce logiciel requiert l’activation du JavaScript et des cookies. Il est compatible avec les navigateurs web usuels", "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "un logiciel développé par l'Université de Strasbourg. Aujourd'hui, son développement est assuré par l’association Framasoft." }, "3rd section": { diff --git a/locale/fr_FR.json b/locale/fr_FR.json index 53d0e18..1f623ca 100644 --- a/locale/fr_FR.json +++ b/locale/fr_FR.json @@ -15,7 +15,7 @@ "Framadate was initially based on ": "DateChaprilOrg est un Framadate initialement basé sur ", "It is governed by the": "Il est régi par la", "The software": "Le logiciel", - "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "Ce logiciel requiert l’activation du JavaScript et des cookies. Il est compatible avec les navigateurs web suivants :", + "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "Ce logiciel requiert l’activation du JavaScript et des cookies. Il est compatible avec les navigateurs web usuels.", "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "un logiciel développé par l'Université de Strasbourg. Aujourd'hui, son développement est assuré par l’association Framasoft." }, "3rd section": { diff --git a/tools/rapport_activite.sh b/tools/rapport_activite.sh index 548e66c..118cc8f 100755 --- a/tools/rapport_activite.sh +++ b/tools/rapport_activite.sh @@ -56,8 +56,7 @@ generateReport() trueHttpRequestCount=$(zgrep "$monthEnglish" /var/log/apache2/date.chapril.org/date.chapril.org-acces.log*|grep "$year"|grep -vi bot|grep -c -v check) echo "Nombre de vraies requêtes http = $trueHttpRequestCount" - botRequestCount=$(zgrep "$monthEnglish" /var/log/apache2/date.chapril.org/date.chapril.org-acces.log*|grep "$year"|grep -i bo\ -t|grep -c -v check) + botRequestCount=$(zgrep "$monthEnglish" /var/log/apache2/date.chapril.org/date.chapril.org-acces.log*|grep "$year"|grep -i bot|grep -c -v check) echo "Nombre de requêtes bot = $botRequestCount" errorRequestCount=$(zgrep "$monthEnglish" /var/log/apache2/date.chapril.org/date.chapril.org-error.log*|grep -c "$year") diff --git a/tpl/index.tpl b/tpl/index.tpl index 2524f1f..ab62e25 100644 --- a/tpl/index.tpl +++ b/tpl/index.tpl @@ -80,13 +80,14 @@

{__('2nd section', 'This software needs javascript and cookies enabled. It is compatible with the following web browsers:')}

-