From c27ddb9066ea32985fe63f67825b12438ea1b6d5 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 7 Jul 2014 21:49:36 -0700 Subject: [PATCH] Rename locale extensions from .txt to .ini Because we're using .ini format, the translation servies spit out files with .ini extensions, so this makes it so we don't necessarily have to rename those files from .ini to .txt before merging. --- build/data/obs-studio/locale/{de.txt => de.ini} | 0 build/data/obs-studio/locale/{en.txt => en.ini} | 0 build/data/obs-studio/locale/{fi.txt => fi.ini} | 0 build/data/obs-studio/locale/{it.txt => it.ini} | 0 build/data/obs-studio/locale/{ja.txt => ja.ini} | 0 build/data/obs-studio/locale/{nb-NO.txt => nb-no.ini} | 0 build/data/obs-studio/locale/{pt.txt => pt.ini} | 0 build/data/obs-studio/locale/{ru.txt => ru.ini} | 0 obs/obs-app.cpp | 6 +++--- 9 files changed, 3 insertions(+), 3 deletions(-) rename build/data/obs-studio/locale/{de.txt => de.ini} (100%) rename build/data/obs-studio/locale/{en.txt => en.ini} (100%) rename build/data/obs-studio/locale/{fi.txt => fi.ini} (100%) rename build/data/obs-studio/locale/{it.txt => it.ini} (100%) rename build/data/obs-studio/locale/{ja.txt => ja.ini} (100%) rename build/data/obs-studio/locale/{nb-NO.txt => nb-no.ini} (100%) rename build/data/obs-studio/locale/{pt.txt => pt.ini} (100%) rename build/data/obs-studio/locale/{ru.txt => ru.ini} (100%) diff --git a/build/data/obs-studio/locale/de.txt b/build/data/obs-studio/locale/de.ini similarity index 100% rename from build/data/obs-studio/locale/de.txt rename to build/data/obs-studio/locale/de.ini diff --git a/build/data/obs-studio/locale/en.txt b/build/data/obs-studio/locale/en.ini similarity index 100% rename from build/data/obs-studio/locale/en.txt rename to build/data/obs-studio/locale/en.ini diff --git a/build/data/obs-studio/locale/fi.txt b/build/data/obs-studio/locale/fi.ini similarity index 100% rename from build/data/obs-studio/locale/fi.txt rename to build/data/obs-studio/locale/fi.ini diff --git a/build/data/obs-studio/locale/it.txt b/build/data/obs-studio/locale/it.ini similarity index 100% rename from build/data/obs-studio/locale/it.txt rename to build/data/obs-studio/locale/it.ini diff --git a/build/data/obs-studio/locale/ja.txt b/build/data/obs-studio/locale/ja.ini similarity index 100% rename from build/data/obs-studio/locale/ja.txt rename to build/data/obs-studio/locale/ja.ini diff --git a/build/data/obs-studio/locale/nb-NO.txt b/build/data/obs-studio/locale/nb-no.ini similarity index 100% rename from build/data/obs-studio/locale/nb-NO.txt rename to build/data/obs-studio/locale/nb-no.ini diff --git a/build/data/obs-studio/locale/pt.txt b/build/data/obs-studio/locale/pt.ini similarity index 100% rename from build/data/obs-studio/locale/pt.txt rename to build/data/obs-studio/locale/pt.ini diff --git a/build/data/obs-studio/locale/ru.txt b/build/data/obs-studio/locale/ru.ini similarity index 100% rename from build/data/obs-studio/locale/ru.txt rename to build/data/obs-studio/locale/ru.ini diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp index 79b6d4f7a..03be763ec 100644 --- a/obs/obs-app.cpp +++ b/obs/obs-app.cpp @@ -166,11 +166,11 @@ bool OBSApp::InitLocale() locale = lang; stringstream file; - file << "locale/" << lang << ".txt"; + file << "locale/" << lang << ".ini"; string englishPath; - if (!GetDataFilePath("locale/" DEFAULT_LANG ".txt", englishPath)) { - OBSErrorBox(NULL, "Failed to find locale/" DEFAULT_LANG ".txt"); + if (!GetDataFilePath("locale/" DEFAULT_LANG ".ini", englishPath)) { + OBSErrorBox(NULL, "Failed to find locale/" DEFAULT_LANG ".ini"); return false; }