From b76a13f47108a6e61715b333448d64882c236ee0 Mon Sep 17 00:00:00 2001 From: Remy Boulanouar Date: Wed, 17 May 2017 13:25:56 +0200 Subject: [PATCH 1/4] Add button to admin ui --- options/locale/locale_en-US.ini | 1 + options/locale/locale_fr-FR.ini | 1 + templates/admin/org/list.tmpl | 3 +++ 3 files changed, 5 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8565b42a7510..e02641f48295 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1134,6 +1134,7 @@ orgs.org_manage_panel = Organization Manage Panel orgs.name = Name orgs.teams = Teams orgs.members = Members +orgs.new_orga = Create New Organization repos.repo_manage_panel = Repository Manage Panel repos.owner = Owner diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 4e80257c11ca..8a34b91aa4ee 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1047,6 +1047,7 @@ orgs.org_manage_panel=Gestion des Organisations orgs.name=Nom orgs.teams=Équipes orgs.members=Membres +orgs.new_orga = Créer une Nouvelle Organisation repos.repo_manage_panel=Gestion des Dépôts repos.owner=Propriétaire diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index f2e258355d65..362352b69512 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -5,6 +5,9 @@ {{template "base/alert" .}}

{{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +
+ {{.i18n.Tr "admin.orgs.new_orga"}} +

{{template "admin/base/search" .}} From 9b976a56b3b3b733255e2ddaae312943ad19f968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Boulanouar?= Date: Wed, 17 May 2017 23:49:27 +0200 Subject: [PATCH 2/4] Update according to review --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e02641f48295..d0ac876b9832 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1134,7 +1134,7 @@ orgs.org_manage_panel = Organization Manage Panel orgs.name = Name orgs.teams = Teams orgs.members = Members -orgs.new_orga = Create New Organization +orgs.new_orga = Create Organization repos.repo_manage_panel = Repository Manage Panel repos.owner = Owner From 5f81b9a682c29421472bd5f6524e76fecd3bc9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Boulanouar?= Date: Wed, 17 May 2017 23:50:06 +0200 Subject: [PATCH 3/4] Update locale_fr-FR.ini --- options/locale/locale_fr-FR.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 8a34b91aa4ee..962fa10d5468 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -309,7 +309,7 @@ password_change_disabled=Les utilisateurs non-locaux n'ont pas le droit de modif emails=Adresses e-mail manage_emails=Gérer les adresses e-mail email_desc=Votre adresse e-mail principale sera utilisée pour les notifications et d'autres opérations. -primary=Principale +primary=Principalef primary_email=Définir comme principale delete_email=Supprimer email_deletion=Suppression de l'adresse e-mail @@ -1047,7 +1047,7 @@ orgs.org_manage_panel=Gestion des Organisations orgs.name=Nom orgs.teams=Équipes orgs.members=Membres -orgs.new_orga = Créer une Nouvelle Organisation +orgs.new_orga = Créer une organisation repos.repo_manage_panel=Gestion des Dépôts repos.owner=Propriétaire From e1b479b40baddfa6153e8dc8adc6ee04878c7f0d Mon Sep 17 00:00:00 2001 From: Remy Boulanouar Date: Thu, 18 May 2017 14:04:15 +0200 Subject: [PATCH 4/4] Rollback to locale french file --- options/locale/locale_fr-FR.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 962fa10d5468..4e80257c11ca 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -309,7 +309,7 @@ password_change_disabled=Les utilisateurs non-locaux n'ont pas le droit de modif emails=Adresses e-mail manage_emails=Gérer les adresses e-mail email_desc=Votre adresse e-mail principale sera utilisée pour les notifications et d'autres opérations. -primary=Principalef +primary=Principale primary_email=Définir comme principale delete_email=Supprimer email_deletion=Suppression de l'adresse e-mail @@ -1047,7 +1047,6 @@ orgs.org_manage_panel=Gestion des Organisations orgs.name=Nom orgs.teams=Équipes orgs.members=Membres -orgs.new_orga = Créer une organisation repos.repo_manage_panel=Gestion des Dépôts repos.owner=Propriétaire