Skip to content

Add button to admin ui #1738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 19, 2017
Merged

Add button to admin ui #1738

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b76a13f
Add button to admin ui
DblK May 17, 2017
9b976a5
Update according to review
DblK May 17, 2017
5f81b9a
Update locale_fr-FR.ini
DblK May 17, 2017
e1b479b
Rollback to locale french file
DblK May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,7 @@ orgs.org_manage_panel = Organization Manage Panel
orgs.name = Name
orgs.teams = Teams
orgs.members = Members
orgs.new_orga = Create Organization

repos.repo_manage_panel = Repository Manage Panel
repos.owner = Owner
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_fr-FR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@sapk sapk May 18, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a typo.
Futhermore, only en-US should be updated the rest will be updated via crowdin.com

Copy link
Member

@lunny lunny May 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

Copy link
Member Author

@DblK DblK May 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want me to remove all changes made to locale_fr-FR.ini?

Copy link
Member

@sapk sapk May 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Member

@sapk sapk May 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And don't hesitate to pass on crowdin to complete 🇫🇷 translation. ;-)

primary_email=Définir comme principale
delete_email=Supprimer
email_deletion=Suppression de l'adresse e-mail
Expand Down Expand Up @@ -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 organisation

repos.repo_manage_panel=Gestion des Dépôts
repos.owner=Propriétaire
Expand Down
3 changes: 3 additions & 0 deletions templates/admin/org/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
<div class="ui right">
<a class="ui black tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "admin.orgs.new_orga"}}</a>
</div>
</h4>
<div class="ui attached segment">
{{template "admin/base/search" .}}
Expand Down