Skip to content

Commit 2b6d8a4

Browse files
authored
Show the API error message as it is (#975)
* Show the API error message as it is * Update an unit test
1 parent e97db90 commit 2b6d8a4

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

wp_localization/localization/en-US/main.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
wp_api_error_generic_error = Something went wrong.
22
3-
site_error_message = Your site sent an error message: {$error_message}.
3+
site_error_message = {$error_message}
44
55
url_parsing_error = URL is invalid.
66

wp_localization/src/lib.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,33 +212,35 @@ mod localization_tests {
212212
impl WpSupportsLocalization for ParseApiRootUrlError {
213213
fn message_bundle(&self) -> crate::MessageBundle<'_> {
214214
match self {
215-
ParseApiRootUrlError::Error { message } => WpMessages::site_error_message(message),
215+
ParseApiRootUrlError::Error { message } => {
216+
WpMessages::response_parsing_error(message)
217+
}
216218
}
217219
}
218220
}
219221

220222
#[test]
221223
fn test_example_localizable_error() {
222-
let expected_en_message = "Your site sent an error message: \u{2068}foo\u{2069}.";
223-
let expected_tr_message = "Siteniz bir hata mesajı gönderdi: \u{2068}foo\u{2069}.";
224+
let expected_en_message = "Response couldn't be parsed: \u{2068}foo\u{2069}.";
225+
let expected_tr_message = "Yanıt işlenemedi: \u{2068}foo\u{2069}.";
224226
{
225227
let map = {
226228
let mut map = HashMap::new();
227-
map.insert("error_message".into(), "foo".into());
229+
map.insert("reason".into(), "foo".into());
228230
map
229231
};
230232
assert_eq!(
231233
LOCALES.lookup_with_args(
232234
WpLocale::from("en-US").as_language_id(),
233-
"site_error_message",
235+
"response_parsing_error",
234236
&map
235237
),
236238
expected_en_message
237239
);
238240
assert_eq!(
239241
LOCALES.lookup_with_args(
240242
WpLocale::from("tr-TR").as_language_id(),
241-
"site_error_message",
243+
"response_parsing_error",
242244
&map
243245
),
244246
expected_tr_message
@@ -249,9 +251,9 @@ mod localization_tests {
249251
};
250252

251253
let message_bundle = error.message_bundle();
252-
assert_eq!(message_bundle.key, "site_error_message");
254+
assert_eq!(message_bundle.key, "response_parsing_error");
253255
let message_args = message_bundle.args.unwrap();
254-
assert_eq!(message_args["error_message"], "foo".into());
256+
assert_eq!(message_args["reason"], "foo".into());
255257
assert_eq!(error.to_string(), expected_en_message);
256258
assert_eq!(error.localize(Some("tr-TR".into())), expected_tr_message);
257259
}

0 commit comments

Comments
 (0)