Mercurial > kallithea
changeset 2424:2dc4cfa44b25 beta
merge with VinDuV fork
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 07 Jun 2012 22:23:39 +0200 |
parents | 6bef2a9f73e2 (current diff) 30589acf820e (diff) |
children | a970b6e7c5a2 |
files | rhodecode/templates/summary/summary.html |
diffstat | 35 files changed, 335 insertions(+), 193 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/feed.py Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/controllers/feed.py Thu Jun 07 22:23:39 2012 +0200 @@ -73,7 +73,7 @@ def __get_desc(self, cs): desc_msg = [] desc_msg.append('%s %s %s:<br/>' % (cs.author, _('commited on'), - cs.date)) + h.fmt_date(cs.date))) desc_msg.append('<pre>') desc_msg.append(cs.message) desc_msg.append('\n')
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Thu Jun 07 22:23:39 2012 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-06-03 01:06+0200\n" -"PO-Revision-Date: 2012-05-20 11:36+0100\n" +"POT-Creation-Date: 2012-06-05 20:42+0200\n" +"PO-Revision-Date: 2012-06-05 20:07+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:94 msgid "All Branches" msgstr "Toutes les branches" @@ -69,16 +69,20 @@ "La requête n’a pu être traitée en raison d’une erreur survenue sur le " "serveur." -#: rhodecode/controllers/feed.py:48 +#: rhodecode/controllers/feed.py:49 #, python-format msgid "Changes on %s repository" msgstr "Changements sur le dépôt %s" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:50 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" +#: rhodecode/controllers/feed.py:75 +msgid "commited on" +msgstr "a commité, le" + #: rhodecode/controllers/files.py:86 #: rhodecode/templates/admin/repos/repo_add.html:13 msgid "add new" @@ -138,19 +142,16 @@ msgstr "Type d’archive inconnu" #: rhodecode/controllers/files.py:461 -#: rhodecode/templates/changeset/changeset_range.html:5 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "Changesets" #: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 -#: rhodecode/templates/branches/branches.html:5 msgid "Branches" msgstr "Branches" #: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 -#: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "Tags" @@ -661,133 +662,123 @@ msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:415 +#: rhodecode/lib/helpers.py:350 +#, python-format +msgid "%a, %d %b %Y %H:%M:%S" +msgstr "%d/%m/%Y à %H:%M:%S" + +#: rhodecode/lib/helpers.py:423 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:419 +#: rhodecode/lib/helpers.py:427 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:463 -#, fuzzy +#: rhodecode/lib/helpers.py:471 msgid "Changeset not found" -msgstr "Dépôt vide" - -#: rhodecode/lib/helpers.py:486 +msgstr "Ensemble de changements non trouvé" + +#: rhodecode/lib/helpers.py:494 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:492 +#: rhodecode/lib/helpers.py:500 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:512 +#: rhodecode/lib/helpers.py:520 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:521 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:522 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:537 +#: rhodecode/lib/helpers.py:545 msgid "fork name " msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:558 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562 +#: rhodecode/lib/helpers.py:560 rhodecode/lib/helpers.py:570 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:554 +#: rhodecode/lib/helpers.py:562 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:564 rhodecode/lib/helpers.py:572 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 +#: rhodecode/lib/helpers.py:566 rhodecode/lib/helpers.py:574 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:560 -msgid "[delete] repository" -msgstr "[a supprimé] le dépôt" - #: rhodecode/lib/helpers.py:568 -#, fuzzy, python-format -#| msgid "created user %s" -msgid "[created] user" -msgstr "utilisateur %s créé" - -#: rhodecode/lib/helpers.py:570 -#, fuzzy, python-format -#| msgid "updated users group %s" -msgid "[updated] user" -msgstr "Le groupe d’utilisateurs %s a été mis à jour." - -#: rhodecode/lib/helpers.py:572 -#, fuzzy, python-format -#| msgid "created users group %s" -msgid "[created] users group" -msgstr "Le groupe d’utilisateurs %s a été créé." - -#: rhodecode/lib/helpers.py:574 -#, fuzzy, python-format -#| msgid "updated users group %s" -msgid "[updated] users group" -msgstr "Le groupe d’utilisateurs %s a été mis à jour." +msgid "[delete] repository" +msgstr "[a supprimé] le dépôt" #: rhodecode/lib/helpers.py:576 -#, fuzzy -#| msgid "[created] repository" -msgid "[commented] on revision in repository" -msgstr "[a créé] le dépôt" +msgid "[created] user" +msgstr "[a créé] l’utilisateur" #: rhodecode/lib/helpers.py:578 -msgid "[pushed] into" -msgstr "[a pushé] dans" +msgid "[updated] user" +msgstr "[a mis à jour] l’utilisateur" #: rhodecode/lib/helpers.py:580 -#, fuzzy -#| msgid "[committed via RhodeCode] into" -msgid "[committed via RhodeCode] into repository" -msgstr "[a commité via RhodeCode] dans" +msgid "[created] users group" +msgstr "[a créé] le groupe d’utilisateurs" #: rhodecode/lib/helpers.py:582 -#, fuzzy -#| msgid "[pulled from remote] into" -msgid "[pulled from remote] into repository" -msgstr "[a pullé depuis un site distant] dans" +msgid "[updated] users group" +msgstr "[a mis à jour] le groupe d’utilisateurs" #: rhodecode/lib/helpers.py:584 +msgid "[commented] on revision in repository" +msgstr "[a commenté] une révision du dépôt" + +#: rhodecode/lib/helpers.py:586 +msgid "[pushed] into" +msgstr "[a pushé] dans" + +#: rhodecode/lib/helpers.py:588 +msgid "[committed via RhodeCode] into repository" +msgstr "[a commité via RhodeCode] dans le dépôt" + +#: rhodecode/lib/helpers.py:590 +msgid "[pulled from remote] into repository" +msgstr "[a pullé depuis un site distant] dans le dépôt" + +#: rhodecode/lib/helpers.py:592 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:586 +#: rhodecode/lib/helpers.py:594 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:596 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:752 +#: rhodecode/lib/helpers.py:760 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:756 +#: rhodecode/lib/helpers.py:764 msgid "No Files" msgstr "Aucun fichier" @@ -856,7 +847,7 @@ msgid "on line %s" msgstr "à la ligne %s" -#: rhodecode/model/comment.py:113 +#: rhodecode/model/comment.py:114 msgid "[Mention]" msgstr "[Mention]" @@ -1005,19 +996,19 @@ msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: rhodecode/model/notification.py:175 +#: rhodecode/model/notification.py:178 msgid "commented on commit" msgstr "a posté un commentaire sur le commit" -#: rhodecode/model/notification.py:176 +#: rhodecode/model/notification.py:179 msgid "sent message" msgstr "a envoyé un message" -#: rhodecode/model/notification.py:177 +#: rhodecode/model/notification.py:180 msgid "mentioned you" msgstr "vous a mentioné" -#: rhodecode/model/notification.py:178 +#: rhodecode/model/notification.py:181 msgid "registered in RhodeCode" msgstr "s’est enregistré sur RhodeCode" @@ -1051,13 +1042,14 @@ msgstr "Tableau de bord" #: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/repo_switcher_list.html:4 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:31 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." -msgstr "filtre rapide" +msgstr "Filtre rapide…" #: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218 msgid "repositories" @@ -1807,6 +1799,12 @@ msgid "private repository" msgstr "Dépôt privé" +#: rhodecode/templates/admin/repos/repo_edit_perms.html:19 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:28 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +msgid "default" +msgstr "[Par défaut]" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 @@ -1857,7 +1855,7 @@ #: rhodecode/templates/admin/repos_groups/repos_groups.html:12 msgid "with" -msgstr "avec support de" +msgstr "comprenant" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 msgid "Add repos group" @@ -1939,7 +1937,6 @@ #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:5 #: rhodecode/templates/settings/repo_settings.html:13 msgid "Settings" msgstr "Options" @@ -2379,14 +2376,12 @@ #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 -#: rhodecode/templates/summary/summary.html:4 msgid "Summary" msgstr "Résumé" #: rhodecode/templates/base/base.html:166 #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 -#: rhodecode/templates/changelog/changelog.html:6 #: rhodecode/templates/changelog/changelog.html:15 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 @@ -2406,7 +2401,6 @@ #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 -#: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "Fichiers" @@ -2454,13 +2448,11 @@ #: rhodecode/templates/base/base.html:235 #: rhodecode/templates/base/base.html:237 -#: rhodecode/templates/followers/followers.html:5 msgid "Followers" msgstr "Followers" #: rhodecode/templates/base/base.html:243 #: rhodecode/templates/base/base.html:245 -#: rhodecode/templates/forks/forks.html:5 msgid "Forks" msgstr "Forks" @@ -2493,8 +2485,9 @@ msgstr "Groupe" #: rhodecode/templates/bookmarks/bookmarks.html:5 -msgid "Bookmarks" -msgstr "Signets" +#, python-format +msgid "%s Bookmarks" +msgstr "Signets de %s" #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -2504,6 +2497,11 @@ msgid "Author" msgstr "Auteur" +#: rhodecode/templates/branches/branches.html:5 +#, python-format +msgid "%s Branches" +msgstr "Branches de %s" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "Date" @@ -2518,6 +2516,11 @@ msgid "revision" msgstr "Révision" +#: rhodecode/templates/changelog/changelog.html:6 +#, python-format +msgid "%s Changelog" +msgstr "Historique de %s" + #: rhodecode/templates/changelog/changelog.html:15 #, python-format msgid "showing %d out of %d revision" @@ -2605,6 +2608,10 @@ msgstr "%s fichiers affectés" #: rhodecode/templates/changeset/changeset.html:6 +#, python-format +msgid "%s Changeset" +msgstr "Changeset de %s" + #: rhodecode/templates/changeset/changeset.html:14 msgid "Changeset" msgstr "Changements" @@ -2689,6 +2696,11 @@ msgid "Leave a comment" msgstr "Laisser un commentaire" +#: rhodecode/templates/changeset/changeset_range.html:5 +#, python-format +msgid "%s Changesets" +msgstr "Changesets de %s" + #: rhodecode/templates/changeset/changeset_range.html:29 msgid "Compare View" msgstr "Comparaison" @@ -2708,7 +2720,6 @@ #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 -#: rhodecode/templates/forks/fork.html:5 msgid "Fork" msgstr "Fork" @@ -2750,10 +2761,19 @@ msgstr "Vous serez redirigé vers %s dans %s secondes." #: rhodecode/templates/files/file_diff.html:4 +#, python-format +msgid "%s File diff" +msgstr "Diff de fichier de %s" + #: rhodecode/templates/files/file_diff.html:12 msgid "File diff" msgstr "Diff de fichier" +#: rhodecode/templates/files/files.html:4 +#, python-format +msgid "%s Files" +msgstr "Fichiers de %s" + #: rhodecode/templates/files/files.html:12 #: rhodecode/templates/summary/summary.html:328 msgid "files" @@ -2769,8 +2789,9 @@ #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 -msgid "Edit file" -msgstr "Éditer un fichier" +#, python-format +msgid "%s Edit file" +msgstr "Edition de fichier de %s" #: rhodecode/templates/files/files_add.html:19 msgid "add file" @@ -2929,13 +2950,23 @@ msgid "No files at given path" msgstr "Aucun fichier à cet endroit" +#: rhodecode/templates/followers/followers.html:5 +#, python-format +msgid "%s Followers" +msgstr "Followers de %s" + #: rhodecode/templates/followers/followers.html:13 msgid "followers" msgstr "followers" #: rhodecode/templates/followers/followers_data.html:12 -msgid "Started following" -msgstr "Date de début" +msgid "Started following -" +msgstr "A commencé à suivre le dépôt :" + +#: rhodecode/templates/forks/fork.html:5 +#, python-format +msgid "%s Fork" +msgstr "Fork de %s" #: rhodecode/templates/forks/fork.html:31 msgid "Fork name" @@ -2957,6 +2988,11 @@ msgid "fork this repository" msgstr "Forker ce dépôt" +#: rhodecode/templates/forks/forks.html:5 +#, python-format +msgid "%s Forks" +msgstr "Forks de %s" + #: rhodecode/templates/forks/forks.html:13 msgid "forks" msgstr "forks" @@ -3028,10 +3064,15 @@ msgid "Permission denied" msgstr "Permission refusée" +#: rhodecode/templates/settings/repo_settings.html:5 +#, python-format +msgid "%s Settings" +msgstr "Réglages de %s" + #: rhodecode/templates/shortlog/shortlog.html:5 -#: rhodecode/templates/summary/summary.html:209 -msgid "Shortlog" -msgstr "Résumé des changements" +#, python-format +msgid "%s Shortlog" +msgstr "Résumé de %s" #: rhodecode/templates/shortlog/shortlog.html:14 msgid "shortlog" @@ -3057,6 +3098,11 @@ msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" +#: rhodecode/templates/summary/summary.html:4 +#, python-format +msgid "%s Summary" +msgstr "Résumé de %s" + #: rhodecode/templates/summary/summary.html:12 msgid "summary" msgstr "résumé" @@ -3113,6 +3159,10 @@ msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt." +#: rhodecode/templates/summary/summary.html:161 +msgid "Download as zip" +msgstr "Télécharger en ZIP" + #: rhodecode/templates/summary/summary.html:164 msgid "Check this to download archive with subrepos" msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" @@ -3129,6 +3179,10 @@ msgid "Stats gathered: " msgstr "Statistiques obtenues :" +#: rhodecode/templates/summary/summary.html:209 +msgid "Shortlog" +msgstr "Résumé des changements" + #: rhodecode/templates/summary/summary.html:211 msgid "Quick start" msgstr "Démarrage rapide" @@ -3170,3 +3224,8 @@ msgid "file removed" msgstr "fichier supprimé" +#: rhodecode/templates/tags/tags.html:5 +#, python-format +msgid "%s Tags" +msgstr "Tags de %s" +
--- a/rhodecode/i18n/rhodecode.pot Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/i18n/rhodecode.pot Thu Jun 07 22:23:39 2012 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-06-03 01:06+0200\n" +"POT-Creation-Date: 2012-06-05 20:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:94 msgid "All Branches" msgstr "" @@ -65,16 +65,20 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:48 +#: rhodecode/controllers/feed.py:49 #, python-format msgid "Changes on %s repository" msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:50 #, python-format msgid "%s %s feed" msgstr "" +#: rhodecode/controllers/feed.py:75 +msgid "commited on" +msgstr "" + #: rhodecode/controllers/files.py:86 #: rhodecode/templates/admin/repos/repo_add.html:13 msgid "add new" @@ -134,19 +138,16 @@ msgstr "" #: rhodecode/controllers/files.py:461 -#: rhodecode/templates/changeset/changeset_range.html:5 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" #: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 -#: rhodecode/templates/branches/branches.html:5 msgid "Branches" msgstr "" #: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 -#: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "" @@ -619,118 +620,123 @@ msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:415 +#: rhodecode/lib/helpers.py:350 +#, python-format +msgid "%a, %d %b %Y %H:%M:%S" +msgstr "" + +#: rhodecode/lib/helpers.py:423 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:419 +#: rhodecode/lib/helpers.py:427 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:463 +#: rhodecode/lib/helpers.py:471 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:494 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:492 +#: rhodecode/lib/helpers.py:500 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:512 +#: rhodecode/lib/helpers.py:520 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:521 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:522 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:537 +#: rhodecode/lib/helpers.py:545 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:558 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562 +#: rhodecode/lib/helpers.py:560 rhodecode/lib/helpers.py:570 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:554 +#: rhodecode/lib/helpers.py:562 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:564 rhodecode/lib/helpers.py:572 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 +#: rhodecode/lib/helpers.py:566 rhodecode/lib/helpers.py:574 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:560 -msgid "[delete] repository" -msgstr "" - #: rhodecode/lib/helpers.py:568 -msgid "[created] user" -msgstr "" - -#: rhodecode/lib/helpers.py:570 -msgid "[updated] user" -msgstr "" - -#: rhodecode/lib/helpers.py:572 -msgid "[created] users group" -msgstr "" - -#: rhodecode/lib/helpers.py:574 -msgid "[updated] users group" +msgid "[delete] repository" msgstr "" #: rhodecode/lib/helpers.py:576 -msgid "[commented] on revision in repository" +msgid "[created] user" msgstr "" #: rhodecode/lib/helpers.py:578 -msgid "[pushed] into" +msgid "[updated] user" msgstr "" #: rhodecode/lib/helpers.py:580 -msgid "[committed via RhodeCode] into repository" +msgid "[created] users group" msgstr "" #: rhodecode/lib/helpers.py:582 -msgid "[pulled from remote] into repository" +msgid "[updated] users group" msgstr "" #: rhodecode/lib/helpers.py:584 -msgid "[pulled] from" +msgid "[commented] on revision in repository" msgstr "" #: rhodecode/lib/helpers.py:586 -msgid "[started following] repository" +msgid "[pushed] into" msgstr "" #: rhodecode/lib/helpers.py:588 +msgid "[committed via RhodeCode] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:590 +msgid "[pulled from remote] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:592 +msgid "[pulled] from" +msgstr "" + +#: rhodecode/lib/helpers.py:594 +msgid "[started following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:596 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:752 +#: rhodecode/lib/helpers.py:760 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:756 +#: rhodecode/lib/helpers.py:764 msgid "No Files" msgstr "" @@ -799,7 +805,7 @@ msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:113 +#: rhodecode/model/comment.py:114 msgid "[Mention]" msgstr "" @@ -938,19 +944,19 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:175 +#: rhodecode/model/notification.py:178 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:176 +#: rhodecode/model/notification.py:179 msgid "sent message" msgstr "" -#: rhodecode/model/notification.py:177 +#: rhodecode/model/notification.py:180 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:178 +#: rhodecode/model/notification.py:181 msgid "registered in RhodeCode" msgstr "" @@ -978,6 +984,7 @@ msgstr "" #: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/repo_switcher_list.html:4 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 @@ -1708,6 +1715,12 @@ msgid "private repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_perms.html:19 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:28 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +msgid "default" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 @@ -1840,7 +1853,6 @@ #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:5 #: rhodecode/templates/settings/repo_settings.html:13 msgid "Settings" msgstr "" @@ -2268,13 +2280,11 @@ #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 -#: rhodecode/templates/summary/summary.html:4 msgid "Summary" msgstr "" #: rhodecode/templates/base/base.html:166 rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 -#: rhodecode/templates/changelog/changelog.html:6 #: rhodecode/templates/changelog/changelog.html:15 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 @@ -2292,7 +2302,7 @@ #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 -#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:40 +#: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "" @@ -2336,12 +2346,10 @@ msgstr "" #: rhodecode/templates/base/base.html:235 rhodecode/templates/base/base.html:237 -#: rhodecode/templates/followers/followers.html:5 msgid "Followers" msgstr "" #: rhodecode/templates/base/base.html:243 rhodecode/templates/base/base.html:245 -#: rhodecode/templates/forks/forks.html:5 msgid "Forks" msgstr "" @@ -2372,7 +2380,8 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:5 -msgid "Bookmarks" +#, python-format +msgid "%s Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:39 @@ -2382,6 +2391,11 @@ msgid "Author" msgstr "" +#: rhodecode/templates/branches/branches.html:5 +#, python-format +msgid "%s Branches" +msgstr "" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "" @@ -2396,6 +2410,11 @@ msgid "revision" msgstr "" +#: rhodecode/templates/changelog/changelog.html:6 +#, python-format +msgid "%s Changelog" +msgstr "" + #: rhodecode/templates/changelog/changelog.html:15 #, python-format msgid "showing %d out of %d revision" @@ -2483,6 +2502,10 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:6 +#, python-format +msgid "%s Changeset" +msgstr "" + #: rhodecode/templates/changeset/changeset.html:14 msgid "Changeset" msgstr "" @@ -2563,6 +2586,11 @@ msgid "Leave a comment" msgstr "" +#: rhodecode/templates/changeset/changeset_range.html:5 +#, python-format +msgid "%s Changesets" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:29 msgid "Compare View" msgstr "" @@ -2582,7 +2610,6 @@ #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 -#: rhodecode/templates/forks/fork.html:5 msgid "Fork" msgstr "" @@ -2624,10 +2651,19 @@ msgstr "" #: rhodecode/templates/files/file_diff.html:4 +#, python-format +msgid "%s File diff" +msgstr "" + #: rhodecode/templates/files/file_diff.html:12 msgid "File diff" msgstr "" +#: rhodecode/templates/files/files.html:4 +#, python-format +msgid "%s Files" +msgstr "" + #: rhodecode/templates/files/files.html:12 #: rhodecode/templates/summary/summary.html:328 msgid "files" @@ -2643,7 +2679,8 @@ #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 -msgid "Edit file" +#, python-format +msgid "%s Edit file" msgstr "" #: rhodecode/templates/files/files_add.html:19 @@ -2803,12 +2840,22 @@ msgid "No files at given path" msgstr "" +#: rhodecode/templates/followers/followers.html:5 +#, python-format +msgid "%s Followers" +msgstr "" + #: rhodecode/templates/followers/followers.html:13 msgid "followers" msgstr "" #: rhodecode/templates/followers/followers_data.html:12 -msgid "Started following" +msgid "Started following -" +msgstr "" + +#: rhodecode/templates/forks/fork.html:5 +#, python-format +msgid "%s Fork" msgstr "" #: rhodecode/templates/forks/fork.html:31 @@ -2831,6 +2878,11 @@ msgid "fork this repository" msgstr "" +#: rhodecode/templates/forks/forks.html:5 +#, python-format +msgid "%s Forks" +msgstr "" + #: rhodecode/templates/forks/forks.html:13 msgid "forks" msgstr "" @@ -2902,9 +2954,14 @@ msgid "Permission denied" msgstr "" +#: rhodecode/templates/settings/repo_settings.html:5 +#, python-format +msgid "%s Settings" +msgstr "" + #: rhodecode/templates/shortlog/shortlog.html:5 -#: rhodecode/templates/summary/summary.html:209 -msgid "Shortlog" +#, python-format +msgid "%s Shortlog" msgstr "" #: rhodecode/templates/shortlog/shortlog.html:14 @@ -2931,6 +2988,11 @@ msgid "Existing repository?" msgstr "" +#: rhodecode/templates/summary/summary.html:4 +#, python-format +msgid "%s Summary" +msgstr "" + #: rhodecode/templates/summary/summary.html:12 msgid "summary" msgstr "" @@ -2987,6 +3049,10 @@ msgid "Downloads are disabled for this repository" msgstr "" +#: rhodecode/templates/summary/summary.html:161 +msgid "Download as zip" +msgstr "" + #: rhodecode/templates/summary/summary.html:164 msgid "Check this to download archive with subrepos" msgstr "" @@ -3003,6 +3069,10 @@ msgid "Stats gathered: " msgstr "" +#: rhodecode/templates/summary/summary.html:209 +msgid "Shortlog" +msgstr "" + #: rhodecode/templates/summary/summary.html:211 msgid "Quick start" msgstr "" @@ -3044,3 +3114,8 @@ msgid "file removed" msgstr "" +#: rhodecode/templates/tags/tags.html:5 +#, python-format +msgid "%s Tags" +msgstr "" +
--- a/rhodecode/lib/helpers.py Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/lib/helpers.py Thu Jun 07 22:23:39 2012 +0200 @@ -345,6 +345,14 @@ hide_credentials = lambda x: ''.join(credentials_filter(x)) +def fmt_date(date): + if date: + return (date.strftime(_(u"%a, %d %b %Y %H:%M:%S").encode('utf8')) + .decode('utf8')) + + return "" + + def is_git(repository): if hasattr(repository, 'alias'): _type = repository.alias
--- a/rhodecode/templates/admin/admin_log.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/admin/admin_log.html Thu Jun 07 22:23:39 2012 +0200 @@ -25,7 +25,7 @@ %endif </td> - <td>${l.action_date}</td> + <td>${h.fmt_date(l.action_date)}</td> <td>${l.user_ip}</td> </tr> %endfor
--- a/rhodecode/templates/admin/repos/repo_edit_perms.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html Thu Jun 07 22:23:39 2012 +0200 @@ -16,7 +16,7 @@ ${_('private repository')} </span> </td> - <td class="private_repo_msg"><img style="vertical-align:bottom" src="${h.url('/images/icons/user.png')}"/>${r2p.user.username}</td> + <td class="private_repo_msg"><img style="vertical-align:bottom" src="${h.url('/images/icons/user.png')}"/>${_('default')}</td> </tr> %else: <tr id="id${id(r2p.user.username)}"> @@ -25,7 +25,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.write')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.admin')}</td> <td style="white-space: nowrap;"> - <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>${r2p.user.username} + <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>${r2p.user.username if r2p.user.username != 'default' else _('default')} </td> <td> %if r2p.user.username !='default':
--- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html Thu Jun 07 22:23:39 2012 +0200 @@ -15,7 +15,7 @@ <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write')}</td> <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin')}</td> <td style="white-space: nowrap;"> - <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>${r2p.user.username} + <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>${r2p.user.username if r2p.user.username != 'default' else _('default')} </td> <td> %if r2p.user.username !='default':
--- a/rhodecode/templates/admin/users/users.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/admin/users/users.html Thu Jun 07 22:23:39 2012 +0200 @@ -40,13 +40,13 @@ <th class="left">${_('action')}</th> </tr> %for cnt,user in enumerate(c.users_list): - %if user.name !='default': + %if user.username !='default': <tr class="parity${cnt%2}"> <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div></td> <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td> <td>${user.name}</td> <td>${user.lastname}</td> - <td>${user.last_login}</td> + <td>${h.fmt_date(user.last_login)}</td> <td>${h.bool2icon(user.active)}</td> <td>${h.bool2icon(user.admin)}</td> <td>${h.bool2icon(bool(user.ldap_dn))}</td>
--- a/rhodecode/templates/bookmarks/bookmarks.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/bookmarks/bookmarks.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Bookmarks')} - ${c.rhodecode_name} + ${_('%s Bookmarks') % c.repo_name} - ${c.rhodecode_name} </%def>
--- a/rhodecode/templates/bookmarks/bookmarks_data.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/bookmarks/bookmarks_data.html Thu Jun 07 22:23:39 2012 +0200 @@ -17,7 +17,7 @@ h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span> </span> </td> - <td><span class="tooltip" title="${h.age(book[1].date)}">${book[1].date}</span></td> + <td><span class="tooltip" title="${h.age(book[1].date)}">${h.fmt_date(book[1].date)}</span></td> <td title="${book[1].author}">${h.person(book[1].author)}</td> <td> <div>
--- a/rhodecode/templates/branches/branches.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/branches/branches.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Branches')} - ${c.rhodecode_name} + ${_('%s Branches') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/branches/branches_data.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/branches/branches_data.html Thu Jun 07 22:23:39 2012 +0200 @@ -17,7 +17,7 @@ h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span> </span> </td> - <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td> + <td><span class="tooltip" title="${h.age(branch[1].date)}">${h.fmt_date(branch[1].date)}</span></td> <td title="${branch[1].author}">${h.person(branch[1].author)}</td> <td> <div> @@ -35,7 +35,7 @@ h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span> </span> </td> - <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td> + <td><span class="tooltip" title="${h.age(branch[1].date)}">${h.fmt_date(branch[1].date)}</span></td> <td title="${branch[1].author}">${h.person(branch[1].author)}</td> <td> <div>
--- a/rhodecode/templates/changelog/changelog.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/changelog/changelog.html Thu Jun 07 22:23:39 2012 +0200 @@ -3,7 +3,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> -${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} +${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> @@ -57,7 +57,7 @@ </div> <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div> </div> - <div class="date">${cs.date}</div> + <div class="date">${h.fmt_date(cs.date)}</div> </div> <div class="mid"> <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
--- a/rhodecode/templates/changeset/changeset.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/changeset/changeset.html Thu Jun 07 22:23:39 2012 +0200 @@ -3,7 +3,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name} + ${_('%s Changeset') % c.repo_name} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> @@ -31,7 +31,7 @@ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} </div> <div class="date"> - ${c.changeset.date} + ${h.fmt_date(c.changeset.date)} </div> <div class="diff-actions"> <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
--- a/rhodecode/templates/changeset/changeset_range.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/changeset/changeset_range.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name} + ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> @@ -40,7 +40,7 @@ <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td> <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td> <td><div class="author">${h.person(cs.author)}</div></td> - <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> + <td><span class="tooltip" title="${h.age(cs.date)}">${h.fmt_date(cs.date)}</span></td> <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td> </tr> %endfor
--- a/rhodecode/templates/files/file_diff.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/files/file_diff.html Thu Jun 07 22:23:39 2012 +0200 @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('File diff')} - ${c.rhodecode_name} + ${_('%s File diff') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/files/files.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/files/files.html Thu Jun 07 22:23:39 2012 +0200 @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Files')} - ${c.rhodecode_name} + ${_('%s Files') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/files/files_add.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/files/files_add.html Thu Jun 07 22:23:39 2012 +0200 @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Edit file')} - ${c.rhodecode_name} + ${_('%s Edit file') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="js_extra()">
--- a/rhodecode/templates/files/files_browser.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/files/files_browser.html Thu Jun 07 22:23:39 2012 +0200 @@ -95,7 +95,7 @@ </td> <td> %if node.is_file(): - <span class="tooltip" title="${node.last_changeset.date}"> + <span class="tooltip" title="${h.fmt_date(node.last_changeset.date)}"> ${h.age(node.last_changeset.date)}</span> %endif </td>
--- a/rhodecode/templates/files/files_edit.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/files/files_edit.html Thu Jun 07 22:23:39 2012 +0200 @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Edit file')} - ${c.rhodecode_name} + ${_('%s Edit file') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="js_extra()">
--- a/rhodecode/templates/files/files_source.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/files/files_source.html Thu Jun 07 22:23:39 2012 +0200 @@ -16,7 +16,7 @@ <div class="code-header"> <div class="stats"> <div class="left img"><img src="${h.url('/images/icons/file.png')}"/></div> - <div class="left item"><pre class="tooltip" title="${c.file.changeset.date}">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</pre></div> + <div class="left item"><pre class="tooltip" title="${h.fmt_date(c.file.changeset.date)}">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</pre></div> <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div> <div class="left item last"><pre>${c.file.mimetype}</pre></div> <div class="buttons">
--- a/rhodecode/templates/followers/followers.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/followers/followers.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Followers')} - ${c.rhodecode_name} + ${_('%s Followers') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/followers/followers_data.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/followers/followers_data.html Thu Jun 07 22:23:39 2012 +0200 @@ -9,7 +9,7 @@ <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span> </div> <div style="clear:both;padding-top: 10px"></div> - <div class="follower_date">${_('Started following')} - + <div class="follower_date">${_('Started following -')} <span class="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div> <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> </div>
--- a/rhodecode/templates/forks/fork.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/forks/fork.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Fork')} - ${c.rhodecode_name} + ${_('%s Fork') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/forks/forks.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/forks/forks.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Forks')} - ${c.rhodecode_name} + ${_('%s Forks') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/index_base.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/index_base.html Thu Jun 07 22:23:39 2012 +0200 @@ -89,7 +89,7 @@ </td> ##LAST CHANGE DATE <td> - <span class="tooltip" title="${repo['last_change']}">${h.age(repo['last_change'])}</span> + <span class="tooltip" title="${h.fmt_date(repo['last_change'])}">${h.age(repo['last_change'])}</span> </td> ##LAST REVISION <td>
--- a/rhodecode/templates/journal/journal_data.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/journal/journal_data.html Thu Jun 07 22:23:39 2012 +0200 @@ -24,7 +24,7 @@ </span> </div> <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> - <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div> + <div class="date"><span class="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div> %endfor </div> </div>
--- a/rhodecode/templates/repo_switcher_list.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/repo_switcher_list.html Thu Jun 07 22:23:39 2012 +0200 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <li class="qfilter_rs"> - <input type="text" style="border:0" value="quick filter..." name="filter" size="15" id="q_filter_rs" /> + <input type="text" style="border:0" value="${_('quick filter...')}" name="filter" size="20" id="q_filter_rs" /> </li> %for repo in c.repos_list:
--- a/rhodecode/templates/settings/repo_settings.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/settings/repo_settings.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Settings')} - ${c.rhodecode_name} + ${_('%s Settings') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/shortlog/shortlog.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/shortlog/shortlog.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Shortlog')} - ${c.rhodecode_name} + ${_('%s Shortlog') % c.repo_name} - ${c.rhodecode_name} </%def>
--- a/rhodecode/templates/shortlog/shortlog_data.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/shortlog/shortlog_data.html Thu Jun 07 22:23:39 2012 +0200 @@ -19,7 +19,7 @@ h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), title=cs.message)} </td> - <td><span class="tooltip" title="${cs.date}"> + <td><span class="tooltip" title="${h.fmt_date(cs.date)}"> ${h.age(cs.date)}</span> </td> <td title="${cs.author}">${h.person(cs.author)}</td>
--- a/rhodecode/templates/summary/summary.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/summary/summary.html Thu Jun 07 22:23:39 2012 +0200 @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Summary')} - ${c.rhodecode_name} + ${_('%s Summary') % c.repo_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> @@ -163,7 +163,7 @@ %endif %else: ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)} - <span id="${'zip_link'}">${h.link_to('Download as zip',h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-btn")}</span> + <span id="${'zip_link'}">${h.link_to(_('Download as zip'), h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-btn")}</span> <span style="vertical-align: bottom"> <input id="archive_subrepos" type="checkbox" name="subrepos" /> <label for="archive_subrepos" class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('with subrepos')}</label>
--- a/rhodecode/templates/tags/tags.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/tags/tags.html Thu Jun 07 22:23:39 2012 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Tags')} - ${c.rhodecode_name} + ${_('%s Tags') % c.repo_name} - ${c.rhodecode_name} </%def>
--- a/rhodecode/templates/tags/tags_data.html Thu Jun 07 14:23:28 2012 +0200 +++ b/rhodecode/templates/tags/tags_data.html Thu Jun 07 22:23:39 2012 +0200 @@ -18,7 +18,7 @@ </span> </span> </td> - <td><span class="tooltip" title="${h.age(tag[1].date)}">${tag[1].date}</span></td> + <td><span class="tooltip" title="${h.age(tag[1].date)}">${h.fmt_date(tag[1].date)}</span></td> <td title="${tag[1].author}">${h.person(tag[1].author)}</td> <td> <div>