From b96084c6522c770d1b6aefe87f751f1881a77236 Mon Sep 17 00:00:00 2001 From: Pierre Dulac Date: Wed, 9 Dec 2015 17:15:54 +0100 Subject: [PATCH] Integrate the git instructions into the README --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 2f1d646..6dd4b3a 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,19 @@ Job done for language: ./MyXcodeProjectDir/fr.lproj By default `git` won't display diff for `.string` files encoded in UTF-16. However, you can [turn on UTF-16 diffs](http://blog.xk72.com/post/31456986659/diff-strings-files-in-git) if you want to. +Create a `.gitattributes` file at your repository root + +```ruby +*.strings diff=localizablestrings +``` + +Then edit your `~/.gitconfig` file add add the following : + +```ruby +[diff "localizablestrings"] +textconv = "iconv -f utf-16 -t utf-8" +``` + ## Known Issues * genstrings doesn't like path containing spaces, so avoid subfolders containing spaces.