From e40485c56f844daccc88a76c6eec82fd130b76ea Mon Sep 17 00:00:00 2001 From: Loic d'Anterroches Date: Fri, 27 Feb 2009 11:10:26 +0100 Subject: [PATCH] Fixed last part of issue 105, update the details of a project. From the forge administration part of a project, you now have a direct link to the project administration tab. --- src/IDF/Views/Admin.php | 1 + src/IDF/locale/fr/idf.po | 23 ++++++++++++-- src/IDF/locale/idf.pot | 30 ++++++++++++------- .../templates/idf/gadmin/projects/base.html | 2 +- .../templates/idf/gadmin/projects/delete.html | 2 +- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/IDF/Views/Admin.php b/src/IDF/Views/Admin.php index 8eed08e..f7c0103 100644 --- a/src/IDF/Views/Admin.php +++ b/src/IDF/Views/Admin.php @@ -167,6 +167,7 @@ class IDF_Views_Admin } return Pluf_Shortcuts_RenderToResponse('idf/gadmin/projects/delete.html', array( + 'project' => $project, 'page_title' => $title, 'form' => $form, 'stats' => $project->getStats(), diff --git a/src/IDF/locale/fr/idf.po b/src/IDF/locale/fr/idf.po index c74f51d..5d51e24 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 10:51+0100\n" -"PO-Revision-Date: 2009-02-27 10:58+0100\n" +"POT-Creation-Date: 2009-02-27 11:09+0100\n" +"PO-Revision-Date: 2009-02-27 11:10+0100\n" "Last-Translator: Loïc d'Anterroches \n" "Language-Team: Translation team \n" "MIME-Version: 1.0\n" @@ -576,6 +576,7 @@ msgstr "Suppression de la vieille version de %s" #: IDF/Views/Wiki.php:316 #: IDF/Views/Admin.php:90 #: IDF/Views/Admin.php:241 +#: IDF/Views/Admin.php:242 #, php-format msgid "Update %s" msgstr "Mise à jour de %s" @@ -1042,6 +1043,7 @@ msgstr "Nom court" #: IDF/Views/Admin.php:202 #: IDF/Form/Admin/ProjectCreate.php:48 #: IDF/Form/Admin/ProjectUpdate.php:42 +#: IDF/Views/Admin.php:203 msgid "Name" msgstr "Nom" @@ -1070,58 +1072,71 @@ msgid "The project has been deleted." msgstr "Le projet a été supprimé." #: IDF/Views/Admin.php:190 +#: IDF/Views/Admin.php:191 msgid "Not Validated User List" msgstr "Liste des utilisateurs non confirmés" #: IDF/Views/Admin.php:193 #: IDF/gettexttemplates/idf/gadmin/users/base.html.php:3 +#: IDF/Views/Admin.php:194 msgid "User List" msgstr "Liste des utilisateurs" #: IDF/Views/Admin.php:196 +#: IDF/Views/Admin.php:197 msgid "This table shows the users in the forge." msgstr "Ce tableau montre les utilisateurs de la forge." #: IDF/Views/Admin.php:201 +#: IDF/Views/Admin.php:202 msgid "login" msgstr "identifiant" #: IDF/Views/Admin.php:203 #: IDF/Form/Admin/UserUpdate.php:99 +#: IDF/Views/Admin.php:204 msgid "Staff" msgstr "Staff" #: IDF/Views/Admin.php:204 +#: IDF/Views/Admin.php:205 msgid "Admin" msgstr "Admin" #: IDF/Views/Admin.php:205 #: IDF/Form/Admin/UserUpdate.php:110 +#: IDF/Views/Admin.php:206 msgid "Active" msgstr "Actif" #: IDF/Views/Admin.php:206 +#: IDF/Views/Admin.php:207 msgid "Last Login" msgstr "Dernier login" #: IDF/Views/Admin.php:211 +#: IDF/Views/Admin.php:212 msgid "No users were found." msgstr "Aucun utilisateur trouvé." #: IDF/Views/Admin.php:248 +#: IDF/Views/Admin.php:249 msgid "You do not have the rights to update this user." msgstr "Vous n'avez pas les droits pour mettre à jour cet utilisateur." #: IDF/Views/Admin.php:264 +#: IDF/Views/Admin.php:265 msgid "The user has been updated." msgstr "L'utilisateur a été mis à jour." #: IDF/Views/Admin.php:283 #: IDF/gettexttemplates/idf/login_form.html.php:7 +#: IDF/Views/Admin.php:284 msgid "Yes" msgstr "Oui" #: IDF/Views/Admin.php:283 +#: IDF/Views/Admin.php:284 msgid "No" msgstr "Non" @@ -3439,3 +3454,7 @@ msgstr "Moi" msgid "Create this documentation page" msgstr "Créer cette page de documentation" +#: IDF/gettexttemplates/idf/gadmin/projects/base.html.php:5 +msgid "Change Project Details" +msgstr "Changer les détails du projet" + diff --git a/src/IDF/locale/idf.pot b/src/IDF/locale/idf.pot index eea6a0f..367080f 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 10:51+0100\n" +"POT-Creation-Date: 2009-02-27 11:09+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -512,6 +512,7 @@ msgid "Delete Old Revision of %s" msgstr "" #: IDF/Views/Wiki.php:316 IDF/Views/Admin.php:90 IDF/Views/Admin.php:241 +#: IDF/Views/Admin.php:242 #, php-format msgid "Update %s" msgstr "" @@ -944,6 +945,7 @@ msgstr "" #: IDF/Views/Admin.php:66 IDF/Views/Admin.php:202 #: IDF/Form/Admin/ProjectCreate.php:48 IDF/Form/Admin/ProjectUpdate.php:42 +#: IDF/Views/Admin.php:203 msgid "Name" msgstr "" @@ -971,56 +973,60 @@ msgstr "" msgid "The project has been deleted." msgstr "" -#: IDF/Views/Admin.php:190 +#: IDF/Views/Admin.php:190 IDF/Views/Admin.php:191 msgid "Not Validated User List" msgstr "" #: IDF/Views/Admin.php:193 #: IDF/gettexttemplates/idf/gadmin/users/base.html.php:3 +#: IDF/Views/Admin.php:194 msgid "User List" msgstr "" -#: IDF/Views/Admin.php:196 +#: IDF/Views/Admin.php:196 IDF/Views/Admin.php:197 msgid "This table shows the users in the forge." msgstr "" -#: IDF/Views/Admin.php:201 +#: IDF/Views/Admin.php:201 IDF/Views/Admin.php:202 msgid "login" msgstr "" #: IDF/Views/Admin.php:203 IDF/Form/Admin/UserUpdate.php:99 +#: IDF/Views/Admin.php:204 msgid "Staff" msgstr "" -#: IDF/Views/Admin.php:204 +#: IDF/Views/Admin.php:204 IDF/Views/Admin.php:205 msgid "Admin" msgstr "" #: IDF/Views/Admin.php:205 IDF/Form/Admin/UserUpdate.php:110 +#: IDF/Views/Admin.php:206 msgid "Active" msgstr "" -#: IDF/Views/Admin.php:206 +#: IDF/Views/Admin.php:206 IDF/Views/Admin.php:207 msgid "Last Login" msgstr "" -#: IDF/Views/Admin.php:211 +#: IDF/Views/Admin.php:211 IDF/Views/Admin.php:212 msgid "No users were found." msgstr "" -#: IDF/Views/Admin.php:248 +#: IDF/Views/Admin.php:248 IDF/Views/Admin.php:249 msgid "You do not have the rights to update this user." msgstr "" -#: IDF/Views/Admin.php:264 +#: IDF/Views/Admin.php:264 IDF/Views/Admin.php:265 msgid "The user has been updated." msgstr "" #: IDF/Views/Admin.php:283 IDF/gettexttemplates/idf/login_form.html.php:7 +#: IDF/Views/Admin.php:284 msgid "Yes" msgstr "" -#: IDF/Views/Admin.php:283 +#: IDF/Views/Admin.php:283 IDF/Views/Admin.php:284 msgid "No" msgstr "" @@ -3302,3 +3308,7 @@ msgstr "" #: IDF/Template/Markdown.php:61 msgid "Create this documentation page" msgstr "" + +#: IDF/gettexttemplates/idf/gadmin/projects/base.html.php:5 +msgid "Change Project Details" +msgstr "" diff --git a/src/IDF/templates/idf/gadmin/projects/base.html b/src/IDF/templates/idf/gadmin/projects/base.html index bf20eee..01eb115 100644 --- a/src/IDF/templates/idf/gadmin/projects/base.html +++ b/src/IDF/templates/idf/gadmin/projects/base.html @@ -2,5 +2,5 @@ {block tabprojects} class="active"{/block} {block subtabs} {trans 'Project List'} | -{trans 'Create Project'} +{trans 'Create Project'} {if $project} | {trans 'Change Project Details'}{/if} {/block} diff --git a/src/IDF/templates/idf/gadmin/projects/delete.html b/src/IDF/templates/idf/gadmin/projects/delete.html index bbf14ae..39b177f 100644 --- a/src/IDF/templates/idf/gadmin/projects/delete.html +++ b/src/IDF/templates/idf/gadmin/projects/delete.html @@ -51,7 +51,7 @@   -| {trans 'Cancel'}{if $stats['total'] > 200}
+| {trans 'Cancel'}{if $stats['total'] > 200}
{trans 'For large projects, the suppression can take a while, please be patient.'}{/if}