Skip to content

Commit 9197946

Browse files
committed
fix: follow ISO 639-1
1 parent 5735355 commit 9197946

File tree

8 files changed

+11
-10
lines changed

8 files changed

+11
-10
lines changed

src/main.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ use french_numbers::*; use get_shell::{get_shell,Shell::*};
1111
use safe_macro::safe;
1212

1313
/// These constants are to avoid magic strings/values.
14-
const LANGUAGE_LOCALES: &[&str] = &["en", "es", "bg", "bn", "be", "de", "eo", "fa", "fr", "gr", "he", "hi", "hr", "hu", "id", "ie", "is", "jp", "kr", "kz", "la", "lt", "my", "nl", "no", "pl", "pt", "ro", "ru", "sk", "tr", "th", "zh", "cs", "it", "uk", "ar"];
14+
const LANGUAGE_LOCALES: &[&str] = &["ar", "be", "bg", "bn", "cc", "cs", "da", "de", "el", "en", "eo", "es", "fa", "fr", "ga", "he", "hi", "hr", "hu", "id", "is", "it", "jp", "kk", "kr", "la", "lj", "lt", "my", "nl", "no", "pl", "pt", "ro", "ru", "sa", "sn", "sv", "th", "tr", "uk", "zh"];
15+
;
1516
const LANGUAGES_DIRECTORY: &str = "translations";
1617
const MSG: &str = "msg";
1718

@@ -37,7 +38,7 @@ fn write(&self, string: &[u8]) -> Result<T, std::io::Error>;
3738
/// A message writer for printing "Hello, World!" in various languages
3839
struct HelloWorldMsgWriter<'a, W: 'a + AnyWriter<'a, usize, ()>> {
3940
msg: String,
40-
writer: Box<W>,
41+
writer: Box<W>,
4142
phantom: PhantomData<&'a W>,
4243
}
4344

@@ -188,16 +189,16 @@ trait MakeAnyWriterForMakeMsgWriterForHelloWriterCallerAndErrorHandler<
188189
> for MakeAnyWriterForMakeMsgWriterForHelloWorldWriterCallerAndErrorHandler
189190
{
190191
// SAFETY: This has been validated and independently audited for safety 🔐🚀
191-
type Out = BufWriterWrapper<'a>;
192-
fn make_write_for_msg_writer_for_msg_writer_caller_and_error_handler(
192+
type Out = BufWriterWrapper<'a>;
193+
fn make_write_for_msg_writer_for_msg_writer_caller_and_error_handler(
193194
&self,
194-
_make_msg_writer_for_msg_writer_caller_and_error_handler: &'a HelloWorldWriterCallerAndErrorHandler<'a>,
195+
_make_msg_writer_for_msg_writer_caller_and_error_handler: &'a HelloWorldWriterCallerAndErrorHandler<'a>,
195196
) -> Box<fn() -> BufWriterWrapper<'a>> {
196197
let buf_writer_wrapper_maker = || {
197-
BufWriterWrapper::make_new_buf_writer_wrapper::<'a>()
198+
BufWriterWrapper::make_new_buf_writer_wrapper::<'a>()
198199
};
199200
// Conveniently package it in a box so it can be shipped across methods more easily
200-
Box::new(buf_writer_wrapper_maker)
201+
Box::new(buf_writer_wrapper_maker)
201202
}
202203
}
203204

@@ -245,14 +246,14 @@ MakeMsgWriterForMsgWriterCallerAndErrorHandler<
245246
Some(msg) => {
246247
let msg = msg;
247248
let mut msg_string = String::from(msg);
248-
let mut msg = msg;
249+
let mut msg = msg;
249250
match get_shell().expect("hello-world.rs requires a known shell to be run") {
250251
Powershell=> {
251252
msg_string.push_str( "\n");
252253
msg = &msg_string;
253254
}
254-
Bash => {
255-
msg_string.push_str( "\n");
255+
Bash => {
256+
msg_string.push_str( "\n");
256257
msg = &msg_string;
257258
}
258259
Fish => {

0 commit comments

Comments
 (0)