Merge lp:~scopecreator-team/scopecreator/rss-emblem into lp:~scopecreator-team/scopecreator/rss-template

Proposed by Chris Wayne
Status: Merged
Merged at revision: 11
Proposed branch: lp:~scopecreator-team/scopecreator/rss-emblem
Merge into: lp:~scopecreator-team/scopecreator/rss-template
Diff against target: 32 lines (+3/-2)
2 files modified
po/rss.pot (+2/-2)
src/scope/query.cpp (+1/-0)
To merge this branch: bzr merge lp:~scopecreator-team/scopecreator/rss-emblem
Reviewer Review Type Date Requested Status
Scott Sweeny (community) Approve
Review via email: mp+259619@code.launchpad.net

This proposal supersedes a proposal from 2015-05-20.

To post a comment you must log in.
Revision history for this message
Scott Sweeny (ssweeny) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/rss.pot'
--- po/rss.pot 2015-03-25 03:39:55 +0000
+++ po/rss.pot 2015-05-20 13:57:31 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-03-24 23:39-0400\n"11"POT-Creation-Date: 2015-05-20 09:29-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,6 +21,6 @@
21msgid "Vox"21msgid "Vox"
22msgstr ""22msgstr ""
2323
24#: ../src/scope/query.cpp:21324#: ../src/scope/query.cpp:214
25msgid "Open"25msgid "Open"
26msgstr ""26msgstr ""
2727
=== modified file 'src/scope/query.cpp'
--- src/scope/query.cpp 2015-03-25 03:17:53 +0000
+++ src/scope/query.cpp 2015-05-20 13:57:31 +0000
@@ -202,6 +202,7 @@
202 res["author"] = sc::Variant(item.author);202 res["author"] = sc::Variant(item.author);
203 res["summary"] = sc::Variant(item.summary);203 res["summary"] = sc::Variant(item.summary);
204 res["content"] = sc::Variant(item.content);204 res["content"] = sc::Variant(item.content);
205 res["emblem"] = sc::Variant(scope_directory_+"/images/emblem.png");
205206
206 if (res.art().empty()) {207 if (res.art().empty()) {
207 res.set_art(scope_directory_ + "/icon.png");208 res.set_art(scope_directory_ + "/icon.png");

Subscribers

People subscribed via source and target branches

to all changes: