TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-06-12 12:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: translation file read (#2009)

Browse Source 
* feat: translation file read

* feat: readme
This commit is contained in:
Fabi 2021-07-12 11:17:31 +02:00 committed by GitHub
parent 4afc31bc00
commit d948685059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console/README.md
View File

@ -25,3 +25,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
## Further help ## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

8
internal/admin/repository/eventsourcing/eventstore/iam.go
View File

@ -413,9 +413,10 @@ func (repo *IAMRepository) GetDefaultLoginTexts(ctx context.Context, lang string
repo.mutex.Lock() repo.mutex.Lock()
defer repo.mutex.Unlock() defer repo.mutex.Unlock()
contents, ok := repo.TranslationFileContents[lang] contents, ok := repo.TranslationFileContents[lang]
var err error
if !ok { if !ok {
contents, err := repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", lang)) contents, err = repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", lang))
if os.IsNotExist(err) { if caos_errs.IsNotFound(err) {
contents, err = repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", repo.SystemDefaults.DefaultLanguage.String())) contents, err = repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", repo.SystemDefaults.DefaultLanguage.String()))
} }
if err != nil { if err != nil {
@ -448,6 +449,9 @@ func (repo *IAMRepository) getIAMEvents(ctx context.Context, sequence uint64) ([
func (repo *IAMRepository) readTranslationFile(filename string) ([]byte, error) { func (repo *IAMRepository) readTranslationFile(filename string) ([]byte, error) {
r, err := repo.LoginDir.Open(filename) r, err := repo.LoginDir.Open(filename)
if os.IsNotExist(err) {
return nil, caos_errs.ThrowNotFound(err, "TEXT-3n9fs", "Errors.TranslationFile.NotFound")
}
if err != nil { if err != nil {
return nil, caos_errs.ThrowInternal(err, "TEXT-93njw", "Errors.TranslationFile.ReadError") return nil, caos_errs.ThrowInternal(err, "TEXT-93njw", "Errors.TranslationFile.ReadError")
} }

8
internal/management/repository/eventsourcing/eventstore/org.go
View File

@ -628,9 +628,10 @@ func (repo *OrgRepository) GetDefaultLoginTexts(ctx context.Context, lang string
repo.mutex.Lock() repo.mutex.Lock()
defer repo.mutex.Unlock() defer repo.mutex.Unlock()
contents, ok := repo.TranslationFileContents[lang] contents, ok := repo.TranslationFileContents[lang]
var err error
if !ok { if !ok {
contents, err := repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", lang)) contents, err = repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", lang))
if os.IsNotExist(err) { if errors.IsNotFound(err) {
contents, err = repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", repo.SystemDefaults.DefaultLanguage.String())) contents, err = repo.readTranslationFile(fmt.Sprintf("/i18n/%s.yaml", repo.SystemDefaults.DefaultLanguage.String()))
} }
if err != nil { if err != nil {
@ -771,6 +772,9 @@ func (repo *OrgRepository) getIAMEvents(ctx context.Context, sequence uint64) ([
func (repo *OrgRepository) readTranslationFile(filename string) ([]byte, error) { func (repo *OrgRepository) readTranslationFile(filename string) ([]byte, error) {
r, err := repo.LoginDir.Open(filename) r, err := repo.LoginDir.Open(filename)
if os.IsNotExist(err) {
return nil, errors.ThrowNotFound(err, "TEXT-93nfl", "Errors.TranslationFile.NotFound")
}
if err != nil { if err != nil {
return nil, errors.ThrowInternal(err, "TEXT-3n8fs", "Errors.TranslationFile.ReadError") return nil, errors.ThrowInternal(err, "TEXT-3n8fs", "Errors.TranslationFile.ReadError")
} }

5
internal/static/i18n/de.yaml
View File

@ -356,8 +356,9 @@ Errors:
Invalid: Kundenspezifischer Text ist ungültig Invalid: Kundenspezifischer Text ist ungültig
NotFound: Kundenspezifischer Text nicht gefunden NotFound: Kundenspezifischer Text nicht gefunden
TranslationFile: TranslationFile:
ReadError: Übersetzungsfile konnte nicht gelesen werden ReadError: Übersetzungsdatei konnte nicht gelesen werden
MergeError: Übersetzungsfile konnte nicht mit benutzerdefinierten Übersetzungen zusammengeführt werden MergeError: Übersetzungsdatei konnte nicht mit benutzerdefinierten Übersetzungen zusammengeführt werden
NotFound: Übersetzungsdatei existiert nicht
EventTypes: EventTypes:
user: user:
added: Benutzer hinzugefügt added: Benutzer hinzugefügt

1
internal/static/i18n/en.yaml
View File

@ -358,6 +358,7 @@ Errors:
TranslationFile: TranslationFile:
ReadError: Error in reading translation file ReadError: Error in reading translation file
MergeError: Translation file could not be merged with custom translations MergeError: Translation file could not be merged with custom translations
NotFound: Translation file doesn't exist
EventTypes: EventTypes:
user: user:
added: User added added: User added