Skip to content

Commit

Permalink
LocaleEditor supports BCP 47 language tags as well
Browse files Browse the repository at this point in the history
Closes gh-33348
  • Loading branch information
jhoeller committed Aug 13, 2024
1 parent 86761cd commit 8be5010
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,13 +30,13 @@
* @author Juergen Hoeller
* @since 26.05.2003
* @see java.util.Locale
* @see org.springframework.util.StringUtils#parseLocaleString
* @see org.springframework.util.StringUtils#parseLocale
*/
public class LocaleEditor extends PropertyEditorSupport {

@Override
public void setAsText(String text) {
setValue(StringUtils.parseLocaleString(text));
setValue(StringUtils.parseLocale(text));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,10 @@ void localeEditor() {
assertThat(localeEditor.getValue()).isEqualTo(Locale.CANADA);
assertThat(localeEditor.getAsText()).isEqualTo("en_CA");

localeEditor = new LocaleEditor();
localeEditor.setAsText("zh-Hans");
assertThat(localeEditor.getValue()).isEqualTo(Locale.forLanguageTag("zh-Hans"));

localeEditor = new LocaleEditor();
assertThat(localeEditor.getAsText()).isEmpty();
}
Expand Down

0 comments on commit 8be5010

Please sign in to comment.