Skip to content

Commit ce21ed6

Browse files
joubertredratlunny
authored andcommitted
Remove remaining Gogs reference on locales and cmd (#430)
1 parent 618407c commit ce21ed6

28 files changed

+286
-284
lines changed

cmd/admin.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright 2016 The Gogs Authors. All rights reserved.
2+
// Copyright 2016 The Gitea Authors. All rights reserved.
23
// Use of this source code is governed by a MIT-style
34
// license that can be found in the LICENSE file.
45

@@ -18,7 +19,7 @@ var (
1819
CmdAdmin = cli.Command{
1920
Name: "admin",
2021
Usage: "Preform admin operations on command line",
21-
Description: `Allow using internal logic of Gogs without hacking into the source code
22+
Description: `Allow using internal logic of Gitea without hacking into the source code
2223
to make automatic initialization process more smoothly`,
2324
Subcommands: []cli.Command{
2425
subcmdCreateUser,

cmd/cert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func runCert(ctx *cli.Context) error {
137137
SerialNumber: serialNumber,
138138
Subject: pkix.Name{
139139
Organization: []string{"Acme Co"},
140-
CommonName: "Gogs",
140+
CommonName: "Gitea",
141141
},
142142
NotBefore: notBefore,
143143
NotAfter: notAfter,

cmd/dump.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright 2014 The Gogs Authors. All rights reserved.
2+
// Copyright 2016 The Gitea Authors. All rights reserved.
23
// Use of this source code is governed by a MIT-style
34
// license that can be found in the LICENSE file.
45

@@ -21,9 +22,9 @@ import (
2122
// CmdDump represents the available dump sub-command.
2223
var CmdDump = cli.Command{
2324
Name: "dump",
24-
Usage: "Dump Gogs files and database",
25+
Usage: "Dump Gitea files and database",
2526
Description: `Dump compresses all related files and database into zip file.
26-
It can be used for backup and capture Gogs server image to send to maintainer`,
27+
It can be used for backup and capture Gitea server image to send to maintainer`,
2728
Action: runDump,
2829
Flags: []cli.Flag{
2930
cli.StringFlag{
@@ -55,14 +56,14 @@ func runDump(ctx *cli.Context) error {
5556
if _, err := os.Stat(tmpDir); os.IsNotExist(err) {
5657
log.Fatalf("Path does not exist: %s", tmpDir)
5758
}
58-
TmpWorkDir, err := ioutil.TempDir(tmpDir, "gogs-dump-")
59+
TmpWorkDir, err := ioutil.TempDir(tmpDir, "gitea-dump-")
5960
if err != nil {
6061
log.Fatalf("Fail to create tmp work directory: %v", err)
6162
}
6263
log.Printf("Creating tmp work dir: %s", TmpWorkDir)
6364

64-
reposDump := path.Join(TmpWorkDir, "gogs-repo.zip")
65-
dbDump := path.Join(TmpWorkDir, "gogs-db.sql")
65+
reposDump := path.Join(TmpWorkDir, "gitea-repo.zip")
66+
dbDump := path.Join(TmpWorkDir, "gitea-db.sql")
6667

6768
log.Printf("Dumping local repositories...%s", setting.RepoRootPath)
6869
zip.Verbose = ctx.Bool("verbose")
@@ -75,18 +76,18 @@ func runDump(ctx *cli.Context) error {
7576
log.Fatalf("Fail to dump database: %v", err)
7677
}
7778

78-
fileName := fmt.Sprintf("gogs-dump-%d.zip", time.Now().Unix())
79+
fileName := fmt.Sprintf("gitea-dump-%d.zip", time.Now().Unix())
7980
log.Printf("Packing dump files...")
8081
z, err := zip.Create(fileName)
8182
if err != nil {
8283
log.Fatalf("Fail to create %s: %v", fileName, err)
8384
}
8485

85-
if err := z.AddFile("gogs-repo.zip", reposDump); err != nil {
86-
log.Fatalf("Fail to include gogs-repo.zip: %v", err)
86+
if err := z.AddFile("gitea-repo.zip", reposDump); err != nil {
87+
log.Fatalf("Fail to include gitea-repo.zip: %v", err)
8788
}
88-
if err := z.AddFile("gogs-db.sql", dbDump); err != nil {
89-
log.Fatalf("Fail to include gogs-db.sql: %v", err)
89+
if err := z.AddFile("gitea-db.sql", dbDump); err != nil {
90+
log.Fatalf("Fail to include gitea-db.sql: %v", err)
9091
}
9192
customDir, err := os.Stat(setting.CustomPath)
9293
if err == nil && customDir.IsDir() {

cmd/serve.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright 2014 The Gogs Authors. All rights reserved.
2+
// Copyright 2016 The Gitea Authors. All rights reserved.
23
// Use of this source code is governed by a MIT-style
34
// license that can be found in the LICENSE file.
45

@@ -76,7 +77,7 @@ var (
7677
)
7778

7879
func fail(userMessage, logMessage string, args ...interface{}) {
79-
fmt.Fprintln(os.Stderr, "Gogs:", userMessage)
80+
fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
8081

8182
if len(logMessage) > 0 {
8283
if !setting.ProdMode {
@@ -144,7 +145,7 @@ func runServ(c *cli.Context) error {
144145
setup("serv.log")
145146

146147
if setting.SSH.Disabled {
147-
println("Gogs: SSH has been disabled")
148+
println("Gitea: SSH has been disabled")
148149
return nil
149150
}
150151

@@ -154,8 +155,8 @@ func runServ(c *cli.Context) error {
154155

155156
cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
156157
if len(cmd) == 0 {
157-
println("Hi there, You've successfully authenticated, but Gogs does not provide shell access.")
158-
println("If this is unexpected, please log in with password and setup Gogs under another user.")
158+
println("Hi there, You've successfully authenticated, but Gitea does not provide shell access.")
159+
println("If this is unexpected, please log in with password and setup Gitea under another user.")
159160
return nil
160161
}
161162

cmd/web.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import (
4444
// CmdWeb represents the available web sub-command.
4545
var CmdWeb = cli.Command{
4646
Name: "web",
47-
Usage: "Start Gogs web server",
48-
Description: `Gogs web server is the only thing you need to run,
47+
Usage: "Start Gitea web server",
48+
Description: `Gitea web server is the only thing you need to run,
4949
and it takes care of all the other things for you`,
5050
Action: runWeb,
5151
Flags: []cli.Flag{

conf/locale/locale_bg-BG.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Потребителско име
110110
admin_password=Парола
111111
confirm_password=Потвърждение на паролата
112112
admin_email=Ел. поща
113-
install_gogs=Инсталирай Gitea
113+
install_btn_confirm=Инсталирай Gitea
114114
test_git_failed=Неуспешно тестването на "git" команда: %v
115115
sqlite3_not_available=Вашата версия не поддържа SQLite3, моля, изтеглете официалната двоична версия от %s, а не gobuild версията.
116116
invalid_db_setting=Настройките на базата данни са некоректни: %v

conf/locale/locale_cs-CZ.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Uživatelské jméno
110110
admin_password=Heslo
111111
confirm_password=Potvrdit heslo
112112
admin_email=E-mailová adresa správce
113-
install_gogs=Nainstalovat Gitea
113+
install_btn_confirm=Nainstalovat Gitea
114114
test_git_failed=Chyba při testu příkazu 'git': %v
115115
sqlite3_not_available=Vaše verze vydání Gitea nepodporuje SQLite3, prosíme stáhněte si oficiální binární balíček z %s, ne gobuild verzi.
116116
invalid_db_setting=Nastavení databáze není správné: %v

conf/locale/locale_de-DE.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Benutzername
110110
admin_password=Passwort
111111
confirm_password=Passwort bestätigen
112112
admin_email=Administrator E-Mail
113-
install_gogs=Gitea installieren
113+
install_btn_confirm=Gitea installieren
114114
test_git_failed=Fehler beim Test des 'git' Kommandos: %v
115115
sqlite3_not_available=Ihre Gitea-Version unterstützt SQLite3 nicht. Bitte laden Sie die offizielle binäre Version von %s herunter, NICHT die gobuild-Version.
116116
invalid_db_setting=Datenbankeinstellungen sind nicht korrekt: %v

conf/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name = Username
110110
admin_password = Password
111111
confirm_password = Confirm Password
112112
admin_email = Admin Email
113-
install_gogs = Install Gitea
113+
install_btn_confirm = Install Gitea
114114
test_git_failed = Fail to test 'git' command: %v
115115
sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version.
116116
invalid_db_setting = Database setting is not correct: %v

conf/locale/locale_es-ES.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Nombre de usuario
110110
admin_password=Contraseña
111111
confirm_password=Confirmar Contraseña
112112
admin_email=Correo electrónico del administrador
113-
install_gogs=Instalar Gitea
113+
install_btn_confirm=Instalar Gitea
114114
test_git_failed=Fallo al probar el comando 'git': %v
115115
sqlite3_not_available=Tu versión no soporta SQLite3, por favor descarga el binario oficial desde %s, NO la versión de gobuild.
116116
invalid_db_setting=La configuración de la base de datos no es correcta: %v

0 commit comments

Comments
 (0)