|
@@ -11,14 +11,14 @@ type ErrorKind = string
|
|
|
|
|
|
var NoError = i18n.Message{ID: "error.none", Other: "No error"}
|
|
|
var Unimplemented = i18n.Message{ID: "error.unimplemented", Other: "Not yet implemented"}
|
|
|
-var ShortNotCreated = i18n.Message{ID: "short_not_created", Other: "Short URL not created for a new target"}
|
|
|
+var ShortNotCreated = i18n.Message{ID: "error.short_not_created", Other: "Short URL not created for a new target"}
|
|
|
var TargetInvalid = i18n.Message{ID: "error.target_invalid", Other: "Target invalid"}
|
|
|
-var ShortNotFound = i18n.Message{ID: "short_not_found", Other: "Short URL not defined"}
|
|
|
-var TargetBlocked = i18n.Message{ID: "target_blocked", Other: "Target blocked"}
|
|
|
-var TargetCensored = i18n.Message{ID: "target_censored", Other: "Target unavailable for legal reasons"}
|
|
|
-var StorageRead = i18n.Message{ID: "storage_read", Other: "Storage read error"}
|
|
|
-var StorageWrite = i18n.Message{ID: "storage_write", Other: "Storage write error"}
|
|
|
-var StorageUnspecified = i18n.Message{ID: "storage_unspecified", Other: "Storage unspecified error"}
|
|
|
+var ShortNotFound = i18n.Message{ID: "error.short_not_found", Other: "Short URL not defined"}
|
|
|
+var TargetBlocked = i18n.Message{ID: "error.target_blocked", Other: "Target blocked"}
|
|
|
+var TargetCensored = i18n.Message{ID: "error.target_censored", Other: "Target unavailable for legal reasons"}
|
|
|
+var StorageRead = i18n.Message{ID: "error.storage_read", Other: "Storage read error"}
|
|
|
+var StorageWrite = i18n.Message{ID: "error.storage_write", Other: "Storage write error"}
|
|
|
+var StorageUnspecified = i18n.Message{ID: "error.storage_unspecified", Other: "Storage unspecified error"}
|
|
|
|
|
|
var ErrorMessages = map[ErrorKind]i18n.Message{
|
|
|
NoError.ID: NoError,
|
|
@@ -27,6 +27,7 @@ var ErrorMessages = map[ErrorKind]i18n.Message{
|
|
|
ShortNotFound.ID: ShortNotFound,
|
|
|
TargetBlocked.ID: TargetBlocked,
|
|
|
TargetCensored.ID: TargetCensored,
|
|
|
+ TargetInvalid.ID: TargetInvalid,
|
|
|
StorageRead.ID: StorageRead,
|
|
|
StorageWrite.ID: StorageWrite,
|
|
|
StorageUnspecified.ID: StorageUnspecified,
|
|
@@ -77,7 +78,7 @@ func MakeError(l *i18n.Localizer, kind ErrorKind, detail string) Error {
|
|
|
})
|
|
|
message = l.MustLocalize(&i18n.LocalizeConfig{
|
|
|
DefaultMessage: &i18n.Message{
|
|
|
- ID: "web.error.format",
|
|
|
+ ID: "error.error_format",
|
|
|
Description: "The format for errors",
|
|
|
One: "{.Kind}: {.Detail}",
|
|
|
LeftDelim: "{",
|