Merge lp:~daker/webbrowser-app/fix.1227055 into lp:webbrowser-app

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 327
Merged at revision: 330
Proposed branch: lp:~daker/webbrowser-app/fix.1227055
Merge into: lp:webbrowser-app
Diff against target: 57 lines (+42/-0)
2 files modified
src/app/Browser.qml (+1/-0)
src/app/CertificateVerificationDialog.qml (+41/-0)
To merge this branch: bzr merge lp:~daker/webbrowser-app/fix.1227055
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Approve
Review via email: mp+186890@code.launchpad.net

Commit message

Added certificateVerificationDialog component

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

42 + // TRANSLATORS: %1 refers to the URL of the current website

One tiny nitpick: %1 refers to the hostname, not the full URL of the website. Can you please update the comment?

Regarding the translation template updates, since there are other pending MRs that add new strings, I suggest we wait and update the template once all those changes have been merged.

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks great, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~daker/webbrowser-app/fix.1227055 updated
327. By Adnane Belmadiaf

Merged trunk
Fixed merge conflicts

Revision history for this message
Adnane Belmadiaf (daker) wrote :

Can you please reapprove this.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml 2013-09-23 14:48:21 +0000
+++ src/app/Browser.qml 2013-09-23 20:22:39 +0000
@@ -346,6 +346,7 @@
346 devicePixelRatio: browser.qtwebkitdpr346 devicePixelRatio: browser.qtwebkitdpr
347347
348 experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled348 experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled
349 experimental.certificateVerificationDialog: CertificateVerificationDialog { }
349 experimental.authenticationDialog: AuthenticationDialog {}350 experimental.authenticationDialog: AuthenticationDialog {}
350 experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}351 experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
351 experimental.alertDialog: AlertDialog { }352 experimental.alertDialog: AlertDialog { }
352353
=== added file 'src/app/CertificateVerificationDialog.qml'
--- src/app/CertificateVerificationDialog.qml 1970-01-01 00:00:00 +0000
+++ src/app/CertificateVerificationDialog.qml 2013-09-23 20:22:39 +0000
@@ -0,0 +1,41 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This file is part of webbrowser-app.
5 *
6 * webbrowser-app is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * webbrowser-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19import QtQuick 2.0
20import Ubuntu.Components 0.1
21import Ubuntu.Components.Popups 0.1 as Popups
22
23Popups.Dialog {
24 title: i18n.tr("This connection is untrusted")
25 // TRANSLATORS: %1 refers to the hostname
26 text: i18n.tr("You are trying to securely reach %1, but the security certificate of this website is not trusted.").arg(model.hostname)
27
28 Button {
29 text: i18n.tr("Proceed anyway")
30 color: "red"
31 onClicked: model.accept()
32 }
33
34 Button {
35 text: i18n.tr("Back to safety")
36 color: "green"
37 onClicked: model.reject()
38 }
39
40 Component.onCompleted: show()
41}

Subscribers

People subscribed via source and target branches

to status/vote changes: