Default external to locale as in CRuby

headius · headius · commit a3b035bbd178 · 2023-05-23T09:55:51.000-05:00
diff --git a/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java b/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
@@ -241,11 +241,7 @@ private void defineEncodingConstant(Ruby runtime, RubyEncoding encoding, String
     public IRubyObject getDefaultExternal() {
         Encoding defaultEncoding = runtime.getDefaultExternalEncoding();
         if (defaultEncoding == null) {
-            // TODO: MRI seems to default blindly to US-ASCII and we were using Charset default from Java...which is right?
-            ByteList encodingName = ByteList.create("US-ASCII");
-            defaultEncoding = runtime.getEncodingService().loadEncoding(encodingName);
-
-            runtime.setDefaultExternalEncoding(defaultEncoding);
+            defaultEncoding = getLocaleEncoding();
         }
         return getEncoding(defaultEncoding);
     }

Original file line number	Diff line number	Diff line change
`@@ -241,11 +241,7 @@ private void defineEncodingConstant(Ruby runtime, RubyEncoding encoding, String`
`241`	`241`	`public IRubyObject getDefaultExternal() {`
`242`	`242`	`Encoding defaultEncoding = runtime.getDefaultExternalEncoding();`
`243`	`243`	`if (defaultEncoding == null) {`
`244`		`- // TODO: MRI seems to default blindly to US-ASCII and we were using Charset default from Java...which is right?`
`245`		`- ByteList encodingName = ByteList.create("US-ASCII");`
`246`		`- defaultEncoding = runtime.getEncodingService().loadEncoding(encodingName);`
`247`		`-`
`248`		`- runtime.setDefaultExternalEncoding(defaultEncoding);`
	`244`	`+ defaultEncoding = getLocaleEncoding();`
`249`	`245`	`}`
`250`	`246`	`return getEncoding(defaultEncoding);`
`251`	`247`	`}`