From 49265e9423e32ce0ebfb0b0ea7ccaf641ef700fd Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Thu, 11 May 2023 10:09:55 +0200 Subject: [PATCH] feat: Translate more errors --- MailCore/API/MailApiError.swift | 4 +++- MailCore/API/MailError.swift | 16 +++++++++++----- .../Localizable/de.lproj/Localizable.strings | Bin 65502 -> 66146 bytes .../Localizable/en.lproj/Localizable.strings | Bin 62074 -> 62682 bytes .../Localizable/es.lproj/Localizable.strings | Bin 65458 -> 66094 bytes .../Localizable/fr.lproj/Localizable.strings | Bin 65884 -> 66512 bytes .../Localizable/it.lproj/Localizable.strings | Bin 65382 -> 66016 bytes 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/MailCore/API/MailApiError.swift b/MailCore/API/MailApiError.swift index ffb145548..4d3c39b02 100644 --- a/MailCore/API/MailApiError.swift +++ b/MailCore/API/MailApiError.swift @@ -38,7 +38,9 @@ class MailApiError: MailError { localizedDescription: MailResourcesStrings.Localizable.errorNewFolderAlreadyExists, shouldDisplay: true ), - MailApiError(code: "folder__not_exists"), + MailApiError(code: "folder__not_exists", + localizedDescription: MailResourcesStrings.Localizable.errorFolderNotFound, + shouldDisplay: true), // Mail MailApiError(code: "mail__move_destination_folder_not_found"), diff --git a/MailCore/API/MailError.swift b/MailCore/API/MailError.swift index c1dfb6b10..3bbb61364 100644 --- a/MailCore/API/MailError.swift +++ b/MailCore/API/MailError.swift @@ -39,9 +39,11 @@ public class MailError: LocalizedError { public let errorDescription: String public let shouldDisplay: Bool - init(code: String, localizedDescription: String? = nil, shouldDisplay: Bool = false) { + init(code: String, + localizedDescription: String = MailResourcesStrings.Localizable.errorUnknown, + shouldDisplay: Bool = false) { self.code = code - errorDescription = localizedDescription ?? "Unknown error" + errorDescription = localizedDescription self.shouldDisplay = shouldDisplay } @@ -49,11 +51,15 @@ public class MailError: LocalizedError { public static let noToken = MailError(code: "noToken", shouldDisplay: true) public static let resourceError = MailError(code: "resourceError", shouldDisplay: true) public static let unknownToken = MailError(code: "unknownToken", shouldDisplay: true) - public static let noMailbox = MailError(code: "noMailbox", shouldDisplay: true) - public static let folderNotFound = MailError(code: "folderNotFound", shouldDisplay: true) + public static let noMailbox = MailError(code: "noMailbox") + public static let folderNotFound = MailError(code: "folderNotFound", + localizedDescription: MailResourcesStrings.Localizable.errorFolderNotFound, + shouldDisplay: true) public static let addressBookNotFound = MailError(code: "addressBookNotFound", shouldDisplay: true) public static let contactNotFound = MailError(code: "contactNotFound", shouldDisplay: true) - public static let messageNotFound = MailError(code: "messageNotFound", shouldDisplay: true) + public static let messageNotFound = MailError(code: "messageNotFound", + localizedDescription: MailResourcesStrings.Localizable.errorMessageNotFound, + shouldDisplay: true) public static let attachmentsSizeLimitReached = MailError(code: "attachmentsSizeLimitReached", localizedDescription: MailResourcesStrings.Localizable .attachmentFileLimitReached, diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings index e913d235a0aff18e7cdbb3d8c9566eed967fa563..b2216640d1b4d469326746f3dfca37a84b3b6006 100644 GIT binary patch delta 470 zcmZ9IO-jQ+6vtn&BDfG;h=_=xA|fg#nrNc9ap6L&x~co5Nm^-1p&zJwZ!jLih2UO1 zfM-zg1U-TJdn1UH$NS*T{6A*izQ;cA%8!lGW>W^TA&z*2BUOpzmcA`6xx?g2B>NH& z)TjH>$(MP!nO*l;B;rd*&wvI@bpU%1_&_6oo~4P*MR|VWR63lbW*9DvJJOceOua9! z1z;lfId#`&Xn8!i)q<-S_+s<%I=5IwsYk@pU^;`bFUQn@6fjS}EX@>h1!I%FWAEf< zc)4P|s!n3V!(|Y5Qg6nD+{#|2_mi$i$jGwz381Hq_QzdXJdEfLq*L&OpvrzmcoL+L$J>e zu})*9wUy7VN+QF|&du&T^WJ=oi*N76m#f0|r3TuPQG^-Qm1)SiqY&RE3zh0X6^!`$ zTo`{^V;47L3g?QIaJFf!kTq%82N2Vm(inM6YO6D)jhb?9S`5h5qoWM^2rujJ#^}~I z9@ad$Nq?peanF0==@Ap1u+WoYWp-h-v|NXFhh@4TYrya8m^e_^*3MSuyS`$e{nVa5 zR)Y#!Q)td2R5#(b(H%iaI79FJft#>?s;;i_T=&F@@~OIgtOkMGiQ~4QI-<*CzS@43 n9d_fE$qYL;DxEluH~zNwUp2MKjOka#Yv{AJ-+%Eh4>kJ@(ehM4 delta 60 zcmcchlKIyY<_(#Qx}^-M3_1)73S6opTz-3VPui4jb*ky3?3Cz>dNP;jO0e1J5WYW+z{YLS8q7rwzjHwCvY z6e$XB-HOj3g5Yyl&x}jCoO_3xx!;`Jr)l}|W@geYtsG;3WjOE|4)zga$hr!TTI0z> zgiQnt=I2pq;YU4;=Nf{IHUvUe$Pq61+{h zXt7`5$YclS_)^y&i;aM+h`kQ;x>0EOKHt>VJVO(R)y~wiCHjn*6o~`AaDiRs0WzfO z{najK$kpvjP2G*>o7%T#w@vtToRBQ(*(V`n^^EAA>{|7Zlv66lB{Fr@va5YgwcCn|EzJG`269(~ delta 60 zcmZ42!m{Z<^M*`D-BN~B1|0?k1_K65AnD7H$WRHSjevY324f)0kimq(3W!0Z;pS((6t~%Ufc6+J0-ix| z=>a^68~v&m3L-^SS65fP*RMX7+4slnYLwX?E7g_))v!PvMS9?@tBNR zlzIDdXZhS_NFi3J7UzJ`CRvYxT>wHx+YHtW#?7ybm2=Ig_ko`&p}!390bbUz#=ImN zQBA1K-Noxh#n5|TL>dxzyth0<4OaVH)#HVVT=ytn>M(taMINUM%R;BbR8#fcbG?uY zbVa^^!>V_5#+tapeCdZPrV{h#2Fxw+Lh^_#gv%T~#?`n4=LVnYp7^We1Z>lmdL72r zqi2ex#^X0;n)*1p!i0f1Cj Ae*gdg delta 60 zcmcc6&T^-TWkWinZYe`5gARiNg8_pjko09pWT*tvMnJw1gE5e0$Y8=?1;ilIaPt(# G6aN8;-3(y> diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings index 246d5e335f5a4bcd907fb8eb390f9b85152f18ce..bd1ebe7c8a07e42c2865a7ac08616ba1577f4485 100644 GIT binary patch delta 470 zcmZXQze)o^5Ql$3Da?zmNN&YC-KEi^HFCo}i z`2-d|fQ6NfPoSXq?G_fwFf+T$&i9*{x9^G9>&d%*p?adRR^%zfJT=wU6}hGWU*!}i z)`sdB@&2ap{AC_mrKO06jv_V4DW!Ez2?gr_B1&TlLyIxqQ+fJ8IqzNYxduwjqnRsu z-1`We6F*GwURka~i22tet~qZwYKW3;C~%C3STo*dsnSGwh_!Xh=@9lvd&IFab