Merge lp:~pitti/messaging-app/i18n-fixes into lp:messaging-app

Proposed by Martin Pitt
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 200
Merged at revision: 205
Proposed branch: lp:~pitti/messaging-app/i18n-fixes
Merge into: lp:messaging-app
Diff against target: 50 lines (+6/-6)
3 files modified
src/qml/MainPage.qml (+1/-1)
src/qml/Messages.qml (+1/-1)
src/qml/ThreadDelegate.qml (+4/-4)
To merge this branch: bzr merge lp:~pitti/messaging-app/i18n-fixes
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+232507@code.launchpad.net

Commit message

Do not mark single space for translation, and fix wrong macros in plural forms of "Attachments" strings.

Description of the change

Fix i18n issues, see commit logs.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml 2014-08-12 15:14:25 +0000
+++ src/qml/MainPage.qml 2014-08-28 05:36:01 +0000
@@ -34,7 +34,7 @@
34 }34 }
3535
36 state: selectionMode ? "select" : searching ? "search" : "default"36 state: selectionMode ? "select" : searching ? "search" : "default"
37 title: selectionMode ? i18n.tr(" ") : i18n.tr("Chats")37 title: selectionMode ? " " : i18n.tr("Chats")
3838
39 bottomEdgeEnabled: !selectionMode && !searching39 bottomEdgeEnabled: !selectionMode && !searching
40 bottomEdgePageComponent: Messages {40 bottomEdgePageComponent: Messages {
4141
=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml 2014-08-20 15:34:00 +0000
+++ src/qml/Messages.qml 2014-08-28 05:36:01 +0000
@@ -113,7 +113,7 @@
113113
114 title: {114 title: {
115 if (selectionMode) {115 if (selectionMode) {
116 return i18n.tr(" ")116 return " "
117 }117 }
118118
119 if (landscape) {119 if (landscape) {
120120
=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml 2014-08-12 15:14:25 +0000
+++ src/qml/ThreadDelegate.qml 2014-08-28 05:36:01 +0000
@@ -65,16 +65,16 @@
65 attachmentCount = imageCount + videoCount + contactCount65 attachmentCount = imageCount + videoCount + contactCount
6666
67 if (imageCount > 0 && attachmentCount == imageCount) {67 if (imageCount > 0 && attachmentCount == imageCount) {
68 return i18n.tr("Attachment: %1 image", "Attachments: %s images").arg(imageCount)68 return i18n.tr("Attachment: %1 image", "Attachments: %1 images").arg(imageCount)
69 }69 }
70 if (videoCount > 0 && attachmentCount == videoCount) {70 if (videoCount > 0 && attachmentCount == videoCount) {
71 return i18n.tr("Attachment: %1 video", "Attachments: %s videos").arg(videoCount)71 return i18n.tr("Attachment: %1 video", "Attachments: %1 videos").arg(videoCount)
72 }72 }
73 if (contactCount > 0 && attachmentCount == contactCount) {73 if (contactCount > 0 && attachmentCount == contactCount) {
74 return i18n.tr("Attachment: %1 contact", "Attachments: %s contacts").arg(contactCount)74 return i18n.tr("Attachment: %1 contact", "Attachments: %1 contacts").arg(contactCount)
75 }75 }
76 if (attachmentCount > 0) {76 if (attachmentCount > 0) {
77 return i18n.tr("Attachment: %1 file", "Attachments: %s files").arg(attachmentCount)77 return i18n.tr("Attachment: %1 file", "Attachments: %1 files").arg(attachmentCount)
78 }78 }
79 return eventTextMessage79 return eventTextMessage
80 }80 }

Subscribers

People subscribed via source and target branches