Skip to content

Commit ce21ed6

Browse files
joubertredratlunny
joubertredrat
authored and
lunny
committed
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

‎conf/locale/locale_fi-FI.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Käyttäjätunnus
110110
admin_password=Salasana
111111
confirm_password=Varmista salasana
112112
admin_email=Ylläpito sähköposti
113-
install_gogs=Asenna Gitea
113+
install_btn_confirm=Asenna Gitea
114114
test_git_failed=Epäonnistui testata 'git' komentoa: %v
115115
sqlite3_not_available=Julkaisu versiosi ei tue SQLite3, ole hyvä ja lataa virallinen binääri versio osoitteesta %s, EI gobuild versiota.
116116
invalid_db_setting=Tietokanta asetus ei ole oikea: %v

‎conf/locale/locale_fr-FR.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Nom d'utilisateur
110110
admin_password=Mot de passe
111111
confirm_password=Confirmez le mot de passe
112112
admin_email=E-mail de l'administrateur
113-
install_gogs=Installer Gitea
113+
install_btn_confirm=Installer Gitea
114114
test_git_failed=Le test de la commande "git" a échoué : %v
115115
sqlite3_not_available=Votre version publiée ne prend pas en charge SQLite3. Veuillez télécharger la version binaire officielle à cette adresse %s.
116116
invalid_db_setting=Paramètres de base de données incorrects : %v

‎conf/locale/locale_it-IT.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Nome utente
110110
admin_password=Password
111111
confirm_password=Conferma Password
112112
admin_email=E-mail dell'Admin
113-
install_gogs=Installare Gitea
113+
install_btn_confirm=Installare Gitea
114114
test_git_failed=Fallito il test del comando git: %v
115115
sqlite3_not_available=Questa versione non supporta SQLite3, si prega di scaricare la versione binaria ufficiale da %s, NON la versione gobuild.
116116
invalid_db_setting=La configurazione del database non è corretta: %v

‎conf/locale/locale_ja-JP.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 をサポートしていません。gobuild バージョンではない、公式のバイナリ バージョンを %s からダウンロードしてください。
116116
invalid_db_setting=データベースの設定が正しくありません: %v

‎conf/locale/locale_lv-LV.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Lietotājvārds
110110
admin_password=Parole
111111
confirm_password=Apstipriniet paroli
112112
admin_email=Administratora e-pasts
113-
install_gogs=Instalēt Gitea
113+
install_btn_confirm=Instalēt Gitea
114114
test_git_failed=Kļūda pārbaudot 'git' komandu: %v
115115
sqlite3_not_available=Jūsu versija neatbalsta SQLite3, lūdzu lejupielādējiet oficiālo bināro versiju no %s, NEVIS gobuild versiju.
116116
invalid_db_setting=Datu bāzes iestatījums nav pareizs: %v

‎conf/locale/locale_nl-NL.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Gebruikersnaam
110110
admin_password=Wachtwoord
111111
confirm_password=Verifieer wachtwoord
112112
admin_email=Beheerder E-mail
113-
install_gogs=Installeer Gitea
113+
install_btn_confirm=Installeer Gitea
114114
test_git_failed=Git test niet gelukt: 'git' commando %v
115115
sqlite3_not_available=Uw versie biedt geen ondersteuning voor SQLite3, download de officiële binaire versie van %s, niet de gobuild versie.
116116
invalid_db_setting=Uw database instellingen zijn niet correct: %v

‎conf/locale/locale_pl-PL.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Nazwa Użytkownika
110110
admin_password=Hasło
111111
confirm_password=Potwierdź hasło
112112
admin_email=E-mail administratora
113-
install_gogs=Zainstaluj Gitea
113+
install_btn_confirm=Zainstaluj Gitea
114114
test_git_failed=Nie udało się przetestować polecenia "git": %v
115115
sqlite3_not_available=Twoje wydanie nie obsługuje SQLite3, proszę pobrać oficjalne wydanie z %s, a NIE wersję z gobuild.
116116
invalid_db_setting=Ustawienia bazy danych nie są poprawne: %v

‎conf/locale/locale_pt-BR.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Nome de usuário
110110
admin_password=Senha
111111
confirm_password=Confirmar senha
112112
admin_email=E-mail do administrador
113-
install_gogs=Instalar Gitea
113+
install_btn_confirm=Instalar Gitea
114114
test_git_failed=Falha ao testar o comando 'git': %v
115115
sqlite3_not_available=Sua versão não suporta SQLite3, por favor faça o download da versão binária oficial em %s, NÃO da versão gobuild.
116116
invalid_db_setting=Configuração do banco de dados não está correta: %v
@@ -1197,4 +1197,3 @@ default_message=Arraste e solte arquivos aqui, ou clique para selecioná-los.
11971197
invalid_input_type=Você não pode enviar arquivos deste tipo.
11981198
file_too_big=O tamanho do arquivo ({{filesize}} MB) excede o limite máximo ({{maxFilesize}} MB).
11991199
remove_file=Remover
1200-

‎conf/locale/locale_ru-RU.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_sr-SP.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_sv-SE.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Användarnamn
110110
admin_password=Lösenord
111111
confirm_password=Bekräfta lösenord
112112
admin_email=Administratörs Epost
113-
install_gogs=Installera Gogs
113+
install_btn_confirm=Installera Gogs
114114
test_git_failed=Misslyckades att testa 'git' kommando: %v
115115
sqlite3_not_available=Din release stödjer ej SQLite3, ladda vänligen ner den officiella binären via %s, inte gobuild varianten.
116116
invalid_db_setting=Databas inställningen är inkorrekt: %v

‎conf/locale/locale_tr-TR.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ admin_name=Kullanıcı Adı
110110
admin_password=Parola
111111
confirm_password=Parolayı Doğrula
112112
admin_email=Yönetici E-Postası
113-
install_gogs=Gogs'u Kur
113+
install_btn_confirm=Gogs'u Kur
114114
test_git_failed='git' komut testi başarısız: %v
115115
sqlite3_not_available=Yayın sürümünüz SQLite3'ü desteklemiyor, lütfen %s'den resmi sürümü (gobuild sürümünü DEĞİL) indirin.
116116
invalid_db_setting=Veritabanı ayarları geçersiz: %v

‎conf/locale/locale_zh-CN.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=立即安装
113+
install_btn_confirm=立即安装
114114
test_git_failed=无法识别 'git' 命令：%v
115115
sqlite3_not_available=您所使用的发行版不支持 SQLite3，请从 %s 下载官方构建版，而不是 gobuild 版本。
116116
invalid_db_setting=数据库设置不正确：%v

‎conf/locale/locale_zh-HK.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=立即安裝
113+
install_btn_confirm=立即安裝
114114
test_git_failed=無法識別 'git' 命令：%v
115115
sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
116116
invalid_db_setting=數據庫設置不正確：%v

‎conf/locale/locale_zh-TW.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=立即安裝
113+
install_btn_confirm=立即安裝
114114
test_git_failed=無法識別 'git' 命令：%v
115115
sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
116116
invalid_db_setting=數據庫設置不正確：%v

‎main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright 2016 The Gitea Authors. All rights reserved.
21
// Copyright 2014 The Gogs Authors. All rights reserved.
2+
// Copyright 2016 The Gitea Authors. All rights reserved.
33
// Use of this source code is governed by a MIT-style
44
// license that can be found in the LICENSE file.
55

‎modules/bindata/bindata.go

Lines changed: 243 additions & 243 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/install.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<div class="ui divider"></div>
235235
<div class="inline field">
236236
<label></label>
237-
<button class="ui primary button">{{.i18n.Tr "install.install_gogs"}}</button>
237+
<button class="ui primary button">{{.i18n.Tr "install.install_btn_confirm"}}</button>
238238
</div>
239239
</form>
240240
</div>

0 commit comments

Comments
 (0)