From 28d5ce417af06e8fbeacdaef5e0ffdf8e2f4f692 Mon Sep 17 00:00:00 2001 From: Loic d'Anterroches Date: Fri, 27 Feb 2009 15:08:56 +0100 Subject: [PATCH] Added per project list of personal closed working/submitted tickets. --- src/IDF/Views/Issue.php | 25 ++++- src/IDF/locale/fr/idf.po | 108 +++++++++++++++++- src/IDF/locale/idf.pot | 118 ++++++++++++++++---- src/IDF/templates/idf/issues/my-issues.html | 6 +- 4 files changed, 226 insertions(+), 31 deletions(-) diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php index a8f6287..68f3ad6 100644 --- a/src/IDF/Views/Issue.php +++ b/src/IDF/Views/Issue.php @@ -88,19 +88,38 @@ class IDF_Views_Issue { $prj = $request->project; $otags = $prj->getTagIdsByStatus('open'); + $ctags = $prj->getTagIdsByStatus('closed'); if (count($otags) == 0) $otags[] = 0; - if ($match[2] == 'submit') { + if (count($ctags) == 0) $ctags[] = 0; + switch ($match[2]) { + case 'submit': $title = sprintf(__('My Submitted %s Issues'), (string) $prj); $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id)); - } else { + break; + case 'submitclosed': + $title = sprintf(__('My Closed Submitted %s Issues'), (string) $prj); + $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id)); + break; + case 'ownerclosed': + $title = sprintf(__('My Closed Working %s Issues'), (string) $prj); + $f_sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id)); + break; + default: $title = sprintf(__('My Working %s Issues'), (string) $prj); $f_sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id)); + break; } // Get stats about the issues $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id)); $nb_submit = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen())); $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id)); $nb_owner = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen())); + // Closed issues + $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id)); + $nb_submit_closed = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen())); + $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id)); + $nb_owner_closed = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen())); + // Paginator to paginate the issues $pag = new Pluf_Paginator(new IDF_Issue()); $pag->class = 'recent-issues'; @@ -128,6 +147,8 @@ class IDF_Views_Issue 'page_title' => $title, 'nb_submit' => $nb_submit, 'nb_owner' => $nb_owner, + 'nb_submit_closed' => $nb_submit_closed, + 'nb_owner_closed' => $nb_owner_closed, 'issues' => $pag, ), $request); diff --git a/src/IDF/locale/fr/idf.po b/src/IDF/locale/fr/idf.po index 5d51e24..9e63548 100644 --- a/src/IDF/locale/fr/idf.po +++ b/src/IDF/locale/fr/idf.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: InDefero\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-27 11:09+0100\n" -"PO-Revision-Date: 2009-02-27 11:10+0100\n" +"POT-Creation-Date: 2009-02-27 15:04+0100\n" +"PO-Revision-Date: 2009-02-27 15:07+0100\n" "Last-Translator: Loïc d'Anterroches \n" "Language-Team: Translation team \n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Bookmarks: 265,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Poedit-Bookmarks: 265,-1,626,-1,-1,-1,-1,-1,-1,-1\n" "X-Poedit-Basepath: /home/loa/Projects/indefero/src\n" #: IDF/Commit.php:54 @@ -140,6 +140,7 @@ msgstr "Résumé :" #: IDF/gettexttemplates/idf/issues/view.html.php:11 #: IDF/gettexttemplates/idf/issues/view.html.php:19 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:7 +#: IDF/gettexttemplates/idf/issues/view.html.php:21 msgid "Status:" msgstr "Statut :" @@ -148,6 +149,7 @@ msgstr "Statut :" #: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:15 #: IDF/gettexttemplates/idf/issues/view.html.php:12 #: IDF/gettexttemplates/idf/issues/view.html.php:20 +#: IDF/gettexttemplates/idf/issues/view.html.php:22 msgid "Owner:" msgstr "Propriétaire :" @@ -169,6 +171,7 @@ msgstr "Propriétaire :" #: IDF/gettexttemplates/idf/downloads/view.html.php:15 #: IDF/gettexttemplates/idf/downloads/delete.html.php:11 #: IDF/gettexttemplates/idf/downloads/download-created-email.txt.php:7 +#: IDF/gettexttemplates/idf/issues/view.html.php:24 msgid "Labels:" msgstr "Étiquettes :" @@ -515,6 +518,10 @@ msgstr "Titre" #: IDF/Form/IssueCreate.php:50 #: IDF/Form/IssueUpdate.php:45 #: IDF/Form/ReviewCreate.php:45 +#: IDF/Views/Issue.php:137 +#: IDF/Views/Issue.php:249 +#: IDF/Views/Issue.php:442 +#: IDF/Views/Issue.php:500 msgid "Summary" msgstr "Résumé" @@ -710,6 +717,10 @@ msgstr "Ce tableau montre les dernières revues de code." #: IDF/Views/Issue.php:224 #: IDF/Views/Issue.php:414 #: IDF/Views/Issue.php:472 +#: IDF/Views/Issue.php:136 +#: IDF/Views/Issue.php:248 +#: IDF/Views/Issue.php:441 +#: IDF/Views/Issue.php:499 msgid "Id" msgstr "Id" @@ -723,6 +734,10 @@ msgstr "Id" #: IDF/Form/IssueCreate.php:92 #: IDF/Form/IssueUpdate.php:88 #: IDF/Form/ReviewCreate.php:101 +#: IDF/Views/Issue.php:138 +#: IDF/Views/Issue.php:250 +#: IDF/Views/Issue.php:443 +#: IDF/Views/Issue.php:501 msgid "Status" msgstr "Statut" @@ -733,6 +748,10 @@ msgstr "Statut" #: IDF/Views/Issue.php:227 #: IDF/Views/Issue.php:417 #: IDF/Views/Issue.php:475 +#: IDF/Views/Issue.php:139 +#: IDF/Views/Issue.php:251 +#: IDF/Views/Issue.php:444 +#: IDF/Views/Issue.php:502 msgid "Last Updated" msgstr "Dernière mise à jour" @@ -778,6 +797,7 @@ msgstr "Votre dashboard - Tickets soumis" #: IDF/Views/User.php:75 #: IDF/Views/Issue.php:51 #: IDF/Views/Issue.php:110 +#: IDF/Views/Issue.php:129 msgid "This table shows the open issues." msgstr "Ce tableau montre les tickets ouverts." @@ -855,95 +875,118 @@ msgstr "Tickets ouverts de %s" #: IDF/Views/Issue.php:231 #: IDF/Views/Issue.php:421 #: IDF/Views/Issue.php:479 +#: IDF/Views/Issue.php:143 +#: IDF/Views/Issue.php:255 +#: IDF/Views/Issue.php:448 +#: IDF/Views/Issue.php:506 msgid "No issues were found." msgstr "Aucun ticket n'a été trouvé." #: IDF/Views/Issue.php:93 +#: IDF/Views/Issue.php:96 #, php-format msgid "My Submitted %s Issues" msgstr "Mes tickets soumis pour %s" #: IDF/Views/Issue.php:96 +#: IDF/Views/Issue.php:108 #, php-format msgid "My Working %s Issues" msgstr "Mes tickets en cours pour %s" #: IDF/Views/Issue.php:141 +#: IDF/Views/Issue.php:162 msgid "Submit a new issue" msgstr "Soumettre un nouveau ticket" #: IDF/Views/Issue.php:155 +#: IDF/Views/Issue.php:178 #, php-format msgid "Issue %d has been created." msgstr "Le ticket %d a été créé." #: IDF/Views/Issue.php:174 +#: IDF/Views/Issue.php:197 #, php-format msgid "Issue %s - %s (%s)" msgstr "Ticket %s - %s (%s)" #: IDF/Views/Issue.php:208 +#: IDF/Views/Issue.php:232 #, php-format msgid "Search Issues - %s" msgstr "Recherche de tickets - %s" #: IDF/Views/Issue.php:220 +#: IDF/Views/Issue.php:244 msgid "This table shows the found issues." msgstr "Ce tableau montre les tickets trouvés." #: IDF/Views/Issue.php:250 +#: IDF/Views/Issue.php:274 #, php-format msgid "Issue %d: %s" msgstr "Ticket %d : %s" #: IDF/Views/Issue.php:272 +#: IDF/Views/Issue.php:298 #, php-format msgid "Issue %d has been updated." msgstr "Le ticket %d a été mise à jour." #: IDF/Views/Issue.php:303 +#: IDF/Views/Issue.php:329 #, php-format msgid "Updated Issue %s - %s (%s)" msgstr "Mise à jour ticket %s - %s (%s)" #: IDF/Views/Issue.php:375 +#: IDF/Views/Issue.php:402 #, php-format msgid "View %s" msgstr "Voir %s" #: IDF/Views/Issue.php:395 +#: IDF/Views/Issue.php:422 #, php-format msgid "%s Closed Issues" msgstr "Tickets fermés de %s" #: IDF/Views/Issue.php:405 +#: IDF/Views/Issue.php:432 msgid "This table shows the closed issues." msgstr "Ce tableau montre les tickets fermés." #: IDF/Views/Issue.php:447 +#: IDF/Views/Issue.php:474 #, php-format msgid "%1$s Issues with Label %2$s" msgstr "%1$s tickets avec l'étiquette %2$s" #: IDF/Views/Issue.php:450 +#: IDF/Views/Issue.php:477 #, php-format msgid "%1$s Closed Issues with Label %2$s" msgstr "Tickets fermés de %1$s avec l'étiquette %2$s" #: IDF/Views/Issue.php:463 +#: IDF/Views/Issue.php:490 #, php-format msgid "This table shows the issues with label %s." msgstr "Ce tableau montre les tickets avec l'étiquette %s." #: IDF/Views/Issue.php:512 +#: IDF/Views/Issue.php:539 msgid "The issue has been removed from your watch list." msgstr "Le ticket a été supprimé de votre liste de surveillance." #: IDF/Views/Issue.php:515 +#: IDF/Views/Issue.php:542 msgid "The issue has been added to your watch list." msgstr "Le ticket a été ajouté à votre liste de surveillance." #: IDF/Views/Issue.php:593 +#: IDF/Views/Issue.php:620 msgid "On your watch list." msgstr "Dans votre liste de surveillance." @@ -1755,6 +1798,7 @@ msgstr "Répertoire %1$s non trouvé dans le commit %2$s." #: IDF/Scm/Mercurial.php:140 #: IDF/Scm/Git.php:183 +#: IDF/Scm/Git.php:187 #, php-format msgid "Not a valid tree: %s." msgstr "Arbre non valide : %s." @@ -2194,6 +2238,8 @@ msgstr "Mise à jour" #: IDF/gettexttemplates/idf/downloads/view.html.php:7 #: IDF/gettexttemplates/idf/downloads/delete.html.php:7 #: IDF/gettexttemplates/idf/downloads/submit.html.php:8 +#: IDF/gettexttemplates/idf/issues/view.html.php:18 +#: IDF/gettexttemplates/idf/issues/create.html.php:14 msgid "Cancel" msgstr "Annuler" @@ -2534,6 +2580,7 @@ msgstr "Supprimer cette version" #: IDF/gettexttemplates/idf/review/view.html.php:23 #: IDF/gettexttemplates/idf/issues/view.html.php:17 #: IDF/gettexttemplates/idf/issues/attachment.html.php:7 +#: IDF/gettexttemplates/idf/issues/view.html.php:19 msgid "Created:" msgstr "Créé :" @@ -2543,6 +2590,7 @@ msgstr "Créé :" #: IDF/gettexttemplates/idf/issues/view.html.php:18 #: IDF/gettexttemplates/idf/downloads/view.html.php:13 #: IDF/gettexttemplates/idf/downloads/delete.html.php:9 +#: IDF/gettexttemplates/idf/issues/view.html.php:20 msgid "Updated:" msgstr "Mis à jour :" @@ -2562,6 +2610,10 @@ msgstr "Le formulaire contient des erreurs. Merci de les corriger pour mettre à #: IDF/gettexttemplates/idf/wiki/update.html.php:5 #: IDF/gettexttemplates/idf/wiki/create.html.php:5 +#: IDF/gettexttemplates/idf/issues/view.html.php:15 +#: IDF/gettexttemplates/idf/issues/view.html.php:17 +#: IDF/gettexttemplates/idf/issues/create.html.php:11 +#: IDF/gettexttemplates/idf/issues/create.html.php:13 msgid "Preview" msgstr "Prévisualisation" @@ -2827,11 +2879,13 @@ msgstr "Voir votre profil public." #: IDF/gettexttemplates/idf/user/dashboard.html.php:5 #: IDF/gettexttemplates/idf/issues/my-issues.html.php:5 +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:7 msgid "Working issues:" msgstr "Tickets en cours:" #: IDF/gettexttemplates/idf/user/dashboard.html.php:6 #: IDF/gettexttemplates/idf/issues/my-issues.html.php:4 +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:6 msgid "Submitted issues:" msgstr "Tickets soumis :" @@ -3202,6 +3256,7 @@ msgstr "Sélectionnez le commit correspondant à votre patch pour être certain #: IDF/gettexttemplates/idf/issues/index.html.php:5 #: IDF/gettexttemplates/idf/issues/search.html.php:3 #: IDF/gettexttemplates/idf/issues/by-label.html.php:6 +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:5 msgid "New Issue" msgstr "Nouveau ticket" @@ -3260,15 +3315,19 @@ msgid "The form contains some errors. Please correct them to change the issue." msgstr "Le formulaire contient des erreurs. Merci de les corriger pour mettre à jour ce ticket." #: IDF/gettexttemplates/idf/issues/view.html.php:15 +#: IDF/gettexttemplates/idf/issues/view.html.php:16 msgid "Submit Changes" msgstr "Soumettre les changements" #: IDF/gettexttemplates/idf/issues/view.html.php:21 +#: IDF/gettexttemplates/idf/issues/view.html.php:23 msgid "Followed by:" msgstr "Suivi par :" #: IDF/gettexttemplates/idf/issues/view.html.php:23 #: IDF/gettexttemplates/idf/issues/create.html.php:13 +#: IDF/gettexttemplates/idf/issues/view.html.php:25 +#: IDF/gettexttemplates/idf/issues/create.html.php:15 msgid "Attach file" msgstr "Attacher un fichier" @@ -3276,6 +3335,10 @@ msgstr "Attacher un fichier" #: IDF/gettexttemplates/idf/issues/view.html.php:25 #: IDF/gettexttemplates/idf/issues/create.html.php:14 #: IDF/gettexttemplates/idf/issues/create.html.php:15 +#: IDF/gettexttemplates/idf/issues/view.html.php:26 +#: IDF/gettexttemplates/idf/issues/view.html.php:27 +#: IDF/gettexttemplates/idf/issues/create.html.php:16 +#: IDF/gettexttemplates/idf/issues/create.html.php:17 msgid "Attach another file" msgstr "Attacher un autre fichier" @@ -3355,6 +3418,7 @@ msgid "The form contains some errors. Please correct them to submit the issue." msgstr "Le formulaire contient des erreurs. Corrigez s'il vous plaît ces erreurs pour soumettre le ticket." #: IDF/gettexttemplates/idf/issues/create.html.php:11 +#: IDF/gettexttemplates/idf/issues/create.html.php:12 msgid "Submit Issue" msgstr "Soumettre le ticket" @@ -3458,3 +3522,41 @@ msgstr "Créer cette page de documentation" msgid "Change Project Details" msgstr "Changer les détails du projet" +#: IDF/Views/Issue.php:100 +#, php-format +msgid "My Closed Submitted %s Issues" +msgstr "Mes tickets soumis et fermés pour %s" + +#: IDF/Views/Issue.php:104 +#, php-format +msgid "My Closed Working %s Issues" +msgstr "Mes tickets fermés pour %s" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:3 +#, fuzzy, php-format +msgid "%%nb_submit_closed%% closed" +msgid_plural "%%nb_submit_closed%% closed" +msgstr[0] "%%nb_submit_closed%% fermés" +msgstr[1] "%%nb_submit_closed%% fermés" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:4 +#, php-format +msgid "%%nb_owner_closed%% closed" +msgid_plural "%%nb_owner_closed%% closed" +msgstr[0] "%%nb_owner_closed%% closed" +msgstr[1] "%%nb_owner_closed%% closed" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:3 +#, php-format +msgid "%%nb_submit_closed%% closed" +msgid_plural "%%nb_submit_closed%% closed" +msgstr[0] "%%nb_submit_closed%% fermé" +msgstr[1] "%%nb_submit_closed%% fermés" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:4 +#, php-format +msgid "%%nb_owner_closed%% closed" +msgid_plural "%%nb_owner_closed%% closed" +msgstr[0] "%%nb_owner_closed%% closed" +msgstr[1] "%%nb_owner_closed%% fermés" + diff --git a/src/IDF/locale/idf.pot b/src/IDF/locale/idf.pot index 367080f..7c0f18d 100644 --- a/src/IDF/locale/idf.pot +++ b/src/IDF/locale/idf.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-27 11:09+0100\n" +"POT-Creation-Date: 2009-02-27 15:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -108,6 +108,7 @@ msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:11 #: IDF/gettexttemplates/idf/issues/view.html.php:19 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:7 +#: IDF/gettexttemplates/idf/issues/view.html.php:21 msgid "Status:" msgstr "" @@ -115,6 +116,7 @@ msgstr "" #: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:15 #: IDF/gettexttemplates/idf/issues/view.html.php:12 #: IDF/gettexttemplates/idf/issues/view.html.php:20 +#: IDF/gettexttemplates/idf/issues/view.html.php:22 msgid "Owner:" msgstr "" @@ -134,6 +136,7 @@ msgstr "" #: IDF/gettexttemplates/idf/downloads/view.html.php:15 #: IDF/gettexttemplates/idf/downloads/delete.html.php:11 #: IDF/gettexttemplates/idf/downloads/download-created-email.txt.php:7 +#: IDF/gettexttemplates/idf/issues/view.html.php:24 msgid "Labels:" msgstr "" @@ -457,6 +460,8 @@ msgstr "" #: IDF/Views/Download.php:272 IDF/Form/Upload.php:40 #: IDF/Form/UpdateUpload.php:42 IDF/Form/IssueCreate.php:50 #: IDF/Form/IssueUpdate.php:45 IDF/Form/ReviewCreate.php:45 +#: IDF/Views/Issue.php:137 IDF/Views/Issue.php:249 IDF/Views/Issue.php:442 +#: IDF/Views/Issue.php:500 msgid "Summary" msgstr "" @@ -637,7 +642,8 @@ msgstr "" #: IDF/Views/Review.php:57 IDF/Views/User.php:81 IDF/Views/Issue.php:60 #: IDF/Views/Issue.php:117 IDF/Views/Issue.php:224 IDF/Views/Issue.php:414 -#: IDF/Views/Issue.php:472 +#: IDF/Views/Issue.php:472 IDF/Views/Issue.php:136 IDF/Views/Issue.php:248 +#: IDF/Views/Issue.php:441 IDF/Views/Issue.php:499 msgid "Id" msgstr "" @@ -645,12 +651,15 @@ msgstr "" #: IDF/Views/Issue.php:119 IDF/Views/Issue.php:226 IDF/Views/Issue.php:416 #: IDF/Views/Issue.php:474 IDF/Form/IssueCreate.php:92 #: IDF/Form/IssueUpdate.php:88 IDF/Form/ReviewCreate.php:101 +#: IDF/Views/Issue.php:138 IDF/Views/Issue.php:250 IDF/Views/Issue.php:443 +#: IDF/Views/Issue.php:501 msgid "Status" msgstr "" #: IDF/Views/Review.php:60 IDF/Views/User.php:85 IDF/Views/Issue.php:63 #: IDF/Views/Issue.php:120 IDF/Views/Issue.php:227 IDF/Views/Issue.php:417 -#: IDF/Views/Issue.php:475 +#: IDF/Views/Issue.php:475 IDF/Views/Issue.php:139 IDF/Views/Issue.php:251 +#: IDF/Views/Issue.php:444 IDF/Views/Issue.php:502 msgid "Last Updated" msgstr "" @@ -693,6 +702,7 @@ msgid "Your Dashboard - Submitted Issues" msgstr "" #: IDF/Views/User.php:75 IDF/Views/Issue.php:51 IDF/Views/Issue.php:110 +#: IDF/Views/Issue.php:129 msgid "This table shows the open issues." msgstr "" @@ -764,96 +774,97 @@ msgid "%s Open Issues" msgstr "" #: IDF/Views/Issue.php:67 IDF/Views/Issue.php:124 IDF/Views/Issue.php:231 -#: IDF/Views/Issue.php:421 IDF/Views/Issue.php:479 +#: IDF/Views/Issue.php:421 IDF/Views/Issue.php:479 IDF/Views/Issue.php:143 +#: IDF/Views/Issue.php:255 IDF/Views/Issue.php:448 IDF/Views/Issue.php:506 msgid "No issues were found." msgstr "" -#: IDF/Views/Issue.php:93 +#: IDF/Views/Issue.php:93 IDF/Views/Issue.php:96 #, php-format msgid "My Submitted %s Issues" msgstr "" -#: IDF/Views/Issue.php:96 +#: IDF/Views/Issue.php:96 IDF/Views/Issue.php:108 #, php-format msgid "My Working %s Issues" msgstr "" -#: IDF/Views/Issue.php:141 +#: IDF/Views/Issue.php:141 IDF/Views/Issue.php:162 msgid "Submit a new issue" msgstr "" -#: IDF/Views/Issue.php:155 +#: IDF/Views/Issue.php:155 IDF/Views/Issue.php:178 #, php-format msgid "Issue %d has been created." msgstr "" -#: IDF/Views/Issue.php:174 +#: IDF/Views/Issue.php:174 IDF/Views/Issue.php:197 #, php-format msgid "Issue %s - %s (%s)" msgstr "" -#: IDF/Views/Issue.php:208 +#: IDF/Views/Issue.php:208 IDF/Views/Issue.php:232 #, php-format msgid "Search Issues - %s" msgstr "" -#: IDF/Views/Issue.php:220 +#: IDF/Views/Issue.php:220 IDF/Views/Issue.php:244 msgid "This table shows the found issues." msgstr "" -#: IDF/Views/Issue.php:250 +#: IDF/Views/Issue.php:250 IDF/Views/Issue.php:274 #, php-format msgid "Issue %d: %s" msgstr "" -#: IDF/Views/Issue.php:272 +#: IDF/Views/Issue.php:272 IDF/Views/Issue.php:298 #, php-format msgid "Issue %d has been updated." msgstr "" -#: IDF/Views/Issue.php:303 +#: IDF/Views/Issue.php:303 IDF/Views/Issue.php:329 #, php-format msgid "Updated Issue %s - %s (%s)" msgstr "" -#: IDF/Views/Issue.php:375 +#: IDF/Views/Issue.php:375 IDF/Views/Issue.php:402 #, php-format msgid "View %s" msgstr "" -#: IDF/Views/Issue.php:395 +#: IDF/Views/Issue.php:395 IDF/Views/Issue.php:422 #, php-format msgid "%s Closed Issues" msgstr "" -#: IDF/Views/Issue.php:405 +#: IDF/Views/Issue.php:405 IDF/Views/Issue.php:432 msgid "This table shows the closed issues." msgstr "" -#: IDF/Views/Issue.php:447 +#: IDF/Views/Issue.php:447 IDF/Views/Issue.php:474 #, php-format msgid "%1$s Issues with Label %2$s" msgstr "" -#: IDF/Views/Issue.php:450 +#: IDF/Views/Issue.php:450 IDF/Views/Issue.php:477 #, php-format msgid "%1$s Closed Issues with Label %2$s" msgstr "" -#: IDF/Views/Issue.php:463 +#: IDF/Views/Issue.php:463 IDF/Views/Issue.php:490 #, php-format msgid "This table shows the issues with label %s." msgstr "" -#: IDF/Views/Issue.php:512 +#: IDF/Views/Issue.php:512 IDF/Views/Issue.php:539 msgid "The issue has been removed from your watch list." msgstr "" -#: IDF/Views/Issue.php:515 +#: IDF/Views/Issue.php:515 IDF/Views/Issue.php:542 msgid "The issue has been added to your watch list." msgstr "" -#: IDF/Views/Issue.php:593 +#: IDF/Views/Issue.php:593 IDF/Views/Issue.php:620 msgid "On your watch list." msgstr "" @@ -1609,7 +1620,7 @@ msgstr "" msgid "Folder %1$s not found in commit %2$s." msgstr "" -#: IDF/Scm/Mercurial.php:140 IDF/Scm/Git.php:183 +#: IDF/Scm/Mercurial.php:140 IDF/Scm/Git.php:183 IDF/Scm/Git.php:187 #, php-format msgid "Not a valid tree: %s." msgstr "" @@ -2057,6 +2068,8 @@ msgstr "" #: IDF/gettexttemplates/idf/downloads/view.html.php:7 #: IDF/gettexttemplates/idf/downloads/delete.html.php:7 #: IDF/gettexttemplates/idf/downloads/submit.html.php:8 +#: IDF/gettexttemplates/idf/issues/view.html.php:18 +#: IDF/gettexttemplates/idf/issues/create.html.php:14 msgid "Cancel" msgstr "" @@ -2411,6 +2424,7 @@ msgstr "" #: IDF/gettexttemplates/idf/review/view.html.php:23 #: IDF/gettexttemplates/idf/issues/view.html.php:17 #: IDF/gettexttemplates/idf/issues/attachment.html.php:7 +#: IDF/gettexttemplates/idf/issues/view.html.php:19 msgid "Created:" msgstr "" @@ -2420,6 +2434,7 @@ msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:18 #: IDF/gettexttemplates/idf/downloads/view.html.php:13 #: IDF/gettexttemplates/idf/downloads/delete.html.php:9 +#: IDF/gettexttemplates/idf/issues/view.html.php:20 msgid "Updated:" msgstr "" @@ -2439,6 +2454,10 @@ msgstr "" #: IDF/gettexttemplates/idf/wiki/update.html.php:5 #: IDF/gettexttemplates/idf/wiki/create.html.php:5 +#: IDF/gettexttemplates/idf/issues/view.html.php:15 +#: IDF/gettexttemplates/idf/issues/view.html.php:17 +#: IDF/gettexttemplates/idf/issues/create.html.php:11 +#: IDF/gettexttemplates/idf/issues/create.html.php:13 msgid "Preview" msgstr "" @@ -2704,11 +2723,13 @@ msgstr "" #: IDF/gettexttemplates/idf/user/dashboard.html.php:5 #: IDF/gettexttemplates/idf/issues/my-issues.html.php:5 +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:7 msgid "Working issues:" msgstr "" #: IDF/gettexttemplates/idf/user/dashboard.html.php:6 #: IDF/gettexttemplates/idf/issues/my-issues.html.php:4 +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:6 msgid "Submitted issues:" msgstr "" @@ -3054,6 +3075,7 @@ msgstr "" #: IDF/gettexttemplates/idf/issues/index.html.php:5 #: IDF/gettexttemplates/idf/issues/search.html.php:3 #: IDF/gettexttemplates/idf/issues/by-label.html.php:6 +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:5 msgid "New Issue" msgstr "" @@ -3115,15 +3137,19 @@ msgid "The form contains some errors. Please correct them to change the issue." msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:15 +#: IDF/gettexttemplates/idf/issues/view.html.php:16 msgid "Submit Changes" msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:21 +#: IDF/gettexttemplates/idf/issues/view.html.php:23 msgid "Followed by:" msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:23 #: IDF/gettexttemplates/idf/issues/create.html.php:13 +#: IDF/gettexttemplates/idf/issues/view.html.php:25 +#: IDF/gettexttemplates/idf/issues/create.html.php:15 msgid "Attach file" msgstr "" @@ -3131,6 +3157,10 @@ msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:25 #: IDF/gettexttemplates/idf/issues/create.html.php:14 #: IDF/gettexttemplates/idf/issues/create.html.php:15 +#: IDF/gettexttemplates/idf/issues/view.html.php:26 +#: IDF/gettexttemplates/idf/issues/view.html.php:27 +#: IDF/gettexttemplates/idf/issues/create.html.php:16 +#: IDF/gettexttemplates/idf/issues/create.html.php:17 msgid "Attach another file" msgstr "" @@ -3203,6 +3233,7 @@ msgid "The form contains some errors. Please correct them to submit the issue." msgstr "" #: IDF/gettexttemplates/idf/issues/create.html.php:11 +#: IDF/gettexttemplates/idf/issues/create.html.php:12 msgid "Submit Issue" msgstr "" @@ -3312,3 +3343,42 @@ msgstr "" #: IDF/gettexttemplates/idf/gadmin/projects/base.html.php:5 msgid "Change Project Details" msgstr "" + +#: IDF/Views/Issue.php:100 +#, php-format +msgid "My Closed Submitted %s Issues" +msgstr "" + +#: IDF/Views/Issue.php:104 +#, php-format +msgid "My Closed Working %s Issues" +msgstr "" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:3 +#, php-format +msgid "%%nb_submit_closed%% closed" +msgid_plural "" +"%%nb_submit_closed%% closed" +msgstr[0] "" +msgstr[1] "" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:4 +#, php-format +msgid "%%nb_owner_closed%% closed" +msgid_plural "%%nb_owner_closed%% closed" +msgstr[0] "" +msgstr[1] "" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:3 +#, php-format +msgid "%%nb_submit_closed%% closed" +msgid_plural "%%nb_submit_closed%% closed" +msgstr[0] "" +msgstr[1] "" + +#: IDF/gettexttemplates/idf/issues/my-issues.html.php:4 +#, php-format +msgid "%%nb_owner_closed%% closed" +msgid_plural "%%nb_owner_closed%% closed" +msgstr[0] "" +msgstr[1] "" diff --git a/src/IDF/templates/idf/issues/my-issues.html b/src/IDF/templates/idf/issues/my-issues.html index a235223..9003996 100644 --- a/src/IDF/templates/idf/issues/my-issues.html +++ b/src/IDF/templates/idf/issues/my-issues.html @@ -10,7 +10,9 @@ {block context} {aurl 'owner_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'owner')} {aurl 'submit_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')} -

{trans 'Submitted issues:'} {$nb_submit}

+{aurl 'owner_closed_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'ownerclosed')} +{aurl 'submit_closed_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'submitclosed')} +

{trans 'Submitted issues:'} {$nb_submit} {if $nb_submit_closed}({blocktrans $nb_submit_closed}{$nb_submit_closed} closed{plural}{$nb_submit_closed} closed{/blocktrans}){/if}

{if $nb_owner > 0} -

{trans 'Working issues:'} {$nb_owner}

{/if} +

{trans 'Working issues:'} {$nb_owner} {if $nb_owner_closed}({blocktrans $nb_owner_closed}{$nb_owner_closed} closed{plural}{$nb_owner_closed} closed{/blocktrans}){/if}

{/if} {/block}