qelly-git: Include translation files and fix search path problem

2 files changed, 25 insertions, 4 deletions

diff --git a/qelly-git/Fix-QTranslator-Filename.patch b/qelly-git/Fix-QTranslator-Filename.patch
new file mode 100644
index 0000000..a94e061
--- /dev/null
+++ b/qelly-git/Fix-QTranslator-Filename.patch
@@ -0,0 +1,14 @@
+diff --git a/src/main.cpp b/src/main.cpp
+index fc7bba4..b32f858 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -36,7 +36,8 @@ int main(int argc, char *argv[])
+ 
+     YL::init_table();
+     QTranslator trans;
+-    trans.load(QLocale::system(), "Qelly", "_");
++    trans.load("Qelly_" + QLocale::system().name().toLower(),
++               a.applicationDirPath(), "_");
+     a.installTranslator(&trans);
+ 
+     UJ::Qelly::Controller c;
diff --git a/qelly-git/PKGBUILD b/qelly-git/PKGBUILD
index 96b9745..c398ac0 100644
--- a/qelly-git/PKGBUILD
+++ b/qelly-git/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: lantw44 (at) gmail (dot) com
 
 pkgname=qelly-git
+_pkgname=Qelly
 pkgver=1.0a2.1.g7c18a56
-pkgrel=1
+pkgrel=2
 pkgdesc="Qelly is a Qt port of Nally"
 arch=('x86_64' 'i686')
 url="https://github.com/uranusjr/Qelly"
@@ -11,8 +12,10 @@ depends=('qt4' 'libqxt')
 makedepends=()
 conflicts=('qelly')
 provides=('qelly')
-source=("$pkgname::git+https://github.com/uranusjr/Qelly.git")
-md5sums=('SKIP')
+source=("$pkgname::git+https://github.com/uranusjr/Qelly.git"
+        "Fix-QTranslator-Filename.patch")
+md5sums=('SKIP'
+         '55915bbd7bc13673a9d510bb2e456c10')
 
 pkgver() {
 	cd "${srcdir}/${pkgname}"
@@ -24,6 +27,7 @@ pkgver() {
 
 build() {
 	cd "${srcdir}/${pkgname}"
+	patch -p1 < ../Fix-QTranslator-Filename.patch
 	qmake-qt4
 	make
 }
@@ -31,5 +35,8 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}"
 	mkdir -p "${pkgdir}/usr/bin"
-	install -m 755 "bin/Qelly" "${pkgdir}/usr/bin"
+	mkdir -p "${pkgdir}/usr/lib/${_pkgname}"
+	install -m 644 "bin/Qelly_zh_tw.qm" "${pkgdir}/usr/lib/${_pkgname}"
+	install -m 755 "bin/Qelly" "${pkgdir}/usr/lib/${_pkgname}"
+	ln -s "../lib/${_pkgname}/Qelly" "${pkgdir}/usr/bin/Qelly"
 }