aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Castro <39478251+VITALISED@users.noreply.github.com>2022-01-19 14:01:18 +1100
committerGitHub <noreply@github.com>2022-01-19 00:01:18 -0300
commit3118268367ce65f08a92ffd67934ce29f0e6d1c1 (patch)
tree7c6d98dffa658e077a350f327afaf4a636c70437
parent56f88c797f2c809b7793a7f039b4d44cba49e446 (diff)
downloadNorthstarMods-3118268367ce65f08a92ffd67934ce29f0e6d1c1.tar.gz
NorthstarMods-3118268367ce65f08a92ffd67934ce29f0e6d1c1.zip
Add functioning diffing for localisation files (#130)
-rw-r--r--.gitattributes2
-rw-r--r--.gitconfig2
-rw-r--r--Northstar.Client/mod/resource/northstar_client_localisation_english.txtbin23974 -> 11694 bytes
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index dc73e0118..0f336320d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-/Northstar.Client/mod/resource/* -text \ No newline at end of file
+/Northstar.Client/mod/resource/*.txt text diff working-tree-encoding=UTF-16 \ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 000000000..cff6f9fcf
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[diff "utf16"]
+textconv = "iconv -f utf-16 -t utf-8" \ No newline at end of file
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
index 42d24dd89..cf12fc17f 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
Binary files differ