Skip to content

Arabic translation - #642

Merged
justinclift merged 8 commits into
sqlitebrowser:masterfrom
mhasbini:master
Jul 11, 2016
Merged

justinclift merged 8 commits into
sqlitebrowser:masterfrom
mhasbini:master

Conversation

@mhasbini

Copy link
Copy Markdown
Contributor

Added Arabic translation.

@justinclift

Copy link
Copy Markdown
Member

Excellent, this seems like a good start. 😄

One small problem with it is showing up... the flag seems to be missing in the drop down list:

screen shot 2016-07-11 at 06 26 04

Are you ok to investigate and fix that?

@vtronko

vtronko commented Jul 11, 2016 •

Copy link
Copy Markdown
Member

@justinclift @0xbsec I already did that. Apply following patch via git apply

 src/translations/flags/flags.qrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/translations/flags/flags.qrc b/src/translations/flags/flags.qrc
index 4d240dc..8b7615d 100644
--- a/src/translations/flags/flags.qrc
+++ b/src/translations/flags/flags.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/flags">
-        <file alias="ar_AR">ar.png</file>
+        <file alias="ar_EG">ar.png</file>
         <file alias="de_DE">de.png</file>
         <file alias="es_ES">es.png</file>
         <file alias="en_US">us.png</file>
-- 
2.9.0

@mhasbini

Copy link
Copy Markdown
Contributor Author

@justinclift Thanks.
@innermous Nice catch, it's truer to be 'ar_SA' instead of 'ar_EG'.

@justinclift

Copy link
Copy Markdown
Member

@0xbsec Yep, the flag is showing up in the drop down list now:

screen shot 2016-07-11 at 19 06 48

Guessing you'll keep adding more translated strings to this issue? If that's the case, just let us know when you're happy with things, and we'll merge it. 😄

@mhasbini

Copy link
Copy Markdown
Contributor Author

@justinclift sqlb_ar.ts is done. You can merge it.

@justinclift
justinclift merged commit dd32f8a into sqlitebrowser:master Jul 11, 2016
@justinclift

justinclift commented Jul 11, 2016 •

Copy link
Copy Markdown
Member

Thanks @0xbsec, done. 😄

(Btw, sorry team. I forgot to choose the "squash commit" option for the merge. 😦 )

@0xbsec As a thought, some of the main strings in the user interface still seem to be in English when I try it. Is that how it should be?

screen shot 2016-07-11 at 19 36 49

@mhasbini

mhasbini commented Jul 11, 2016 •

Copy link
Copy Markdown
Contributor Author

@justinclift Most welcome. No, they should be translated in sqlb_ar.ts. Same thing happening with French translation ( and maybe others ), example: Revert Changes should be translated ( here ), but it isn't translated in the GUI either.

@justinclift

Copy link
Copy Markdown
Member

Thanks @0xbsec. Didn't know that was happening. I've just created issue #643 about it, so we can investigate it properly. 😄

@vtronko

vtronko commented Jul 11, 2016

Copy link
Copy Markdown
Member

@justinclift oooops, latest commits are a bit messy now.

@justinclift

justinclift commented Jul 12, 2016 •

Copy link
Copy Markdown
Member

Yeah, sorry @innermous. I was tempted to manually merge them afterwards, then force push a single commit onto our main repo... but that's generally bad practise. So I've resisted. 😧

@vtronko

vtronko commented Jul 12, 2016

Copy link
Copy Markdown
Member

@justinclift just imo, but in this special case it would be better than a pyle of commits with similar commit messages. Especially if you brought force push immediately before anyone ever fetched changes.
But what 's done that's done 😄

@justinclift

Copy link
Copy Markdown
Member

Yeah, next time one of us forgets, it probably would be better to manually merge then force push. 😄

@vtronko

vtronko commented Jul 12, 2016

Copy link
Copy Markdown
Member

@justinclift I always check log via tig three times before push 😆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants