Merge lp:~bregma/geis/lp-964469 into lp:geis

[Stephen M. Webb]

Fix error message(s) in "help" dialog (lp: #964469).

= Problem description =

geisview crashed with AttributeError in on_menu_item_about(): 'module' object has no attribute 'license'
(lp: #964469)

= The fix =

Fix variable names used reflectively in geisview tool "about" dialog.

= Test coverage =

No automated tests available. Run the geisview tool and click on the 'Help' menu, it should just work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/geis-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-raring-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-raring-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-raring-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/geis-ci/4/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'tools/geisview/defaults.py.in'
--- tools/geisview/defaults.py.in	2012-12-04 12:39:16 +0000
+++ tools/geisview/defaults.py.in	2013-05-01 15:58:27 +0000
@@ -45,16 +45,19 @@
 copyright = 'Copyright 2011 Canonical, Ltd.'
 description = _("A GEIS data viewer.\n\nGEIS Viewer is a part of "
                 "the Canonical gesture recognition stack.")
-authors = ["Stephen M. Webb  <[e-mail]"]
+authors = ["Stephen M. Webb  &lt;[e-mail]&gt;"]
+translator_credit = u''
 
-LICENSE = _("%s is free software; you can redistribute it and/or modify " 
-       "it under the terms of version 3 of the GNU General Public License "
-       "as published by the Free Software Foundation.\n\n").replace("%s", appname),
+license = "{} {} {}".format(_(u"%s is free software; you can redistribute "
+       "it and/or modify it under the terms of version 3 of the GNU General "
+       "Public License "
+       "as published by the Free Software Foundation.\n\n").replace("%s",
+               appname),
 _("%s is distributed in the hope that it will be useful, "
        "but WITHOUT ANY WARRANTY; without even the implied warranty of "
        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
-       "GNU General Public License for more details.\n\n").replace("%s", appname),
+       "GNU General Public License for more details.\n\n").replace("%s",
+               appname),
 _("You should have received a copy of the GNU General Public License "
-  "along with this program.  If not, see <http://www.gnu.org/licenses/>.")
-
+  "along with this program.  If not, see <http://www.gnu.org/licenses/>."))