Merge branch 'develop' of projects.ceondo.com:indefero

release-script

@@ -1,10 +1,13 @@
 #!/bin/sh
 last="$1"
 new="$2"
+PLUF_PATH=`php -r "require_once('./IDF/conf/path.php'); echo PLUF_PATH;"`
+echo "php $PLUF_PATH/extracttemplates.php ./IDF/conf/idf.php ./IDF/gettexttemplates"
 echo "xgettext -o idf.pot -p ./IDF/locale --force-po --from-code=UTF-8 --keyword --keyword=__ --keyword=_n:1,2 -L PHP ./IDF/*.php"
 echo "find ./ -iname \"*.php\" -exec xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j --keyword --keyword=__ --keyword=_n:1,2 -L PHP {} \;"
+echo 'for pofile in `ls ./IDF/locale/*/idf.po`; do msgmerge -U $pofile ./IDF/locale/idf.pot; done'
 echo "# git tag v$new"
 echo "git archive --format=zip --prefix=indefero-$new/ v$new > indefero-$new.zip"
 echo "git log --no-merges v$new ^v$last > ChangeLog-$new"
 echo "git shortlog --no-merges v$new ^v$last > ShortLog"
-echo "git diff --stat --summary -M v$last v$new > diffstat-$new"
+echo "git diff --stat --summary -M v$last v$new > diffstat-$new"

src/IDF/Form/MembersConf.php

@@ -101,7 +101,7 @@ class IDF_Form_MembersConf extends Pluf_Form
         $n = count($bad);
         if ($n) {
             $badlogins = Pluf_esc(implode(', ', $bad));
-            throw new Pluf_Form_Invalid(sprintf(_n('The following login is invalid: %s.', 'The following login are invalids: %s.', $n), $badlogins));
+            throw new Pluf_Form_Invalid(sprintf(_n('The following login is invalid: %s.', 'The following logins are invalid: %s.', $n), $badlogins));
         }
         return $logins;
     }