Merge lp:~ibelieve/ubuntu-filemanager-app/fix-1198858-typo into lp:ubuntu-filemanager-app

Proposed by Michael Spencer
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 42
Merged at revision: 45
Proposed branch: lp:~ibelieve/ubuntu-filemanager-app/fix-1198858-typo
Merge into: lp:ubuntu-filemanager-app
Diff against target: 25 lines (+2/-2)
2 files modified
FileDetailsPopover.qml (+1/-1)
FolderListPage.qml (+1/-1)
To merge this branch: bzr merge lp:~ibelieve/ubuntu-filemanager-app/fix-1198858-typo
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+173487@code.launchpad.net

Commit message

Fixed typos related to LP #1198858

Description of the change

Fixed two typos related to LP #1198858. This does not actually fix the bug, as I think the problem is in the plugin.

To post a comment you must log in.
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Approving

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FileDetailsPopover.qml'
2--- FileDetailsPopover.qml 2013-06-30 02:06:29 +0000
3+++ FileDetailsPopover.qml 2013-07-08 12:50:40 +0000
4@@ -28,7 +28,7 @@
5 contentHeight: contents.height + 2 * contents.anchors.margins
6
7 function dateTimeFormat(dateTime) {
8- return Qt.formatDateTime(dateTime, Qt.DefaultLocaleShortDate) || "Uknown"
9+ return Qt.formatDateTime(dateTime, Qt.DefaultLocaleShortDate) || "Unknown"
10 }
11
12 function permissionsToString(model) {
13
14=== modified file 'FolderListPage.qml'
15--- FolderListPage.qml 2013-07-03 13:31:12 +0000
16+++ FolderListPage.qml 2013-07-08 12:50:40 +0000
17@@ -182,7 +182,7 @@
18 : i18n.tr("%1 files").arg(folderListView.count))
19 property date creationDate: pageModel.pathCreatedDate
20 property date modifiedDate: pageModel.pathModifiedDate
21- property bool isWriteable: pageModel.pathIsWriteable
22+ property bool isWritable: pageModel.pathIsWritable
23 property bool isReadable: true
24 property bool isExecutable: true
25 }

Subscribers

People subscribed via source and target branches