Re: [Sugar-devel] [ASLO] Release Record-94
On Fri, Mar 16, 2012 at 9:52 PM, Rafael Ortiz raf...@activitycentral.com wrote: On Fri, Mar 16, 2012 at 4:40 PM, Sugar Labs Activities activit...@sugarlabs.org wrote: Activity Homepage: http://activities.sugarlabs.org/addon/4081 Sugar Platform: 0.96 - 0.96 Download Now: http://activities.sugarlabs.org/downloads/file/27923/record-94.xo Release notes: Sugar Labs Activities http://activities.sugarlabs.org Release notes appreciated. And a tar file release too please. http://download.sugarlabs.org/sources/honey/Record/ Peter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH Help] fixed SL#2535
From: Kalpa Pathum Welivitigoda callka...@gmail.com --- help/Sugar_Introduction.html |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/help/Sugar_Introduction.html b/help/Sugar_Introduction.html index 3f339d7..3597a54 100644 --- a/help/Sugar_Introduction.html +++ b/help/Sugar_Introduction.html @@ -52,7 +52,7 @@ td valign=topimg title=Home_backup alt=Home_backup src=Sugar/Introduction/Home_backup.png width=100 border=0 height=75 //td td valign=top pstrongEverything is saved /strongstrong automatically/strongstrong./strongstrong /strong -br /It is our goal that you will never lose your work. Documents will eventually by synced with a network server, adding additional protection. +br /It is our goal that you will never lose your work. Documents will eventually be synced with a network server, adding additional protection. /p/td /tr /tbody /table @@ -148,4 +148,4 @@ Author : iIntroduction/i br/copy; Walter Bender 2006, 2008br/Modificat /p /div /body -/html/body \ No newline at end of file +/html/body -- 1.7.7.6 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Some questions about root and olpc logins.
Thanks Paul, Alan, Martin, James. Well, I guess the only-allow-wheel-group-users-to-switch-to -su was the thing that I had missed out; now everything seems to fall in place :: == b. If I add password for root; and both root and olpc are part of wheel group, then : (i) on os883.img, doing su - from olpc login DOES NOT ask for the root password. (ii) on my F14 machine, doing su - from olpc login DOES ask for the root password, and authentication is successful upon entering the correct root-password. What is the reason for this difference in behaviour? === Case b. (i) is explained, since olpc is in wheel group, so it is allowed to su; moreover since there is the line authsufficient pam_wheel.so trust use_uid in /etc/pam.d/su, thus wheel group users need not be asked for password. === c. If I add password for root, and only root is part of the wheel group, then : (i) on os883.img, doing su - from olpc login DOES ask the root-password, but the authentication is NEVER successful, no matter what password is entered. (ii) on my F14 machine, doing su - from olpc login DOES ask for the root password, and authentication is successful upon entering the correct root-password. Now, since olpc is not a part of wheel group, thus, it cannot su, come what may I commented out the line (as suggested by James) :: auth requiredpam_wheel.so use_uid in /etc/pam.d/su, and now, it rightfully asks for root-password, and upon entering the correct password, authrorizes the entry into the zone :) Thanks everyone. Regards, Ajay On Sat, Mar 17, 2012 at 3:27 AM, James Cameron qu...@laptop.org wrote: On Sat, Mar 17, 2012 at 12:40:11AM +0530, Ajay Garg wrote: Hi all. I just compared the root and olpc logins functioning on os883.img, and my F14 laptop; and I am curious about the following things :: a. Why is root login not protected by a password on os883.img ? We have always done this with OLPC builds. If I recall correctly, the basis for it was that the learner always is in control of their own machine, it is always with them, and the learner is allowed to damage the software and lose their data in order to learn. This ties in with the OLPC Core Principles of Child Ownership and Free and Open Source. b. If I add password for root; and both root and olpc are part of wheel group, then : (i) on os883.img, doing su - from olpc login DOES NOT ask for the root password. (ii) on my F14 machine, doing su - from olpc login DOES ask for the root password, and authentication is successful upon entering the correct root-password. What is the reason for this difference in behaviour? olpc-os-builder.git:modules/base/kspost.10.core.inc # allow sudo for olpc user echo %wheel ALL=(ALL) NOPASSWD: ALL /etc/sudoers # Only allow su access to those in the wheel group (#5537) sed -i -e '1,6s/^#auth/auth/' /etc/pam.d/su c. If I add password for root, and only root is part of the wheel group, then : (i) on os883.img, doing su - from olpc login DOES ask the root-password, but the authentication is NEVER successful, no matter what password is entered. (ii) on my F14 machine, doing su - from olpc login DOES ask for the root password, and authentication is successful upon entering the correct root-password. What is the reason for this difference in behaviour? Same as above. It might very well be a design decision; just my bad that I am unaware of it :| ;-) -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Wikipedia-33.5
Hi Gonzalo, On Thu, Mar 15, 2012 at 9:12 AM, Sugar Labs Activities activit...@sugarlabs.org wrote: Download Now: http://activities.sugarlabs.org/downloads/file/27915/wikipedia-33.5.xo Is it intentional that this version is 55mb larger than the previous one? Thanks, Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH finance] Commit from Sugar Labs: Translation System by user aputsiaq.: 31 of 31 messages translated (0 fuzzy).
From: Pootle daemon poo...@pootle.sugarlabs.org
expenses with no category specified are displayed as Unknown
fix to SL#3097
---
budgetscreen.py |6 +-
chartscreen.py |6 +-
po/da.po|8
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..045a002 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
-catbox = gtk.Label(c)
+# If there is no category, display as Unknown
+if c is '':
+catbox = gtk.Label('Unknown')
+else:
+catbox = gtk.Label(c)
catbox.set_padding(10, 0)
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..fec333c 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -90,7 +90,11 @@ class ChartScreen(gtk.HBox):
hbox = gtk.HBox()
catlabel = gtk.Label()
-catlabel.set_markup(c)
+# If there is no category, display as Unknown
+if c is '':
+catlabel.set_markup('Unknown')
+else:
+catlabel.set_markup(c)
catgroup.add_widget(catlabel)
color = finance.get_category_color_str(c)
diff --git a/po/da.po b/po/da.po
index 12a7c34..a325b80 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2011-08-08 08:54-0300\n
-PO-Revision-Date: 2011-04-08 03:26+0200\n
-Last-Translator: Aputsiaq a...@isit.gl\n
+PO-Revision-Date: 2012-03-09 11:45+0200\n
+Last-Translator: Aputsiaq Niels a...@isit.gl\n
Language-Team: LANGUAGE l...@li.org\n
-Language: \n
+Language: da\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
Plural-Forms: nplurals=2; plural=(n != 1);\n
-X-Generator: Pootle 2.0.1\n
+X-Generator: Pootle 2.0.5\n
#: activity/activity.info:2 finance.py:100
msgid Finance
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH finance] Commit from Sugar Labs: Translation System by user aputsiaq.: 31 of 31 messages translated (0 fuzzy).
Hi,
El día 17 de marzo de 2012 15:04, callka...@gmail.com escribió:
From: Pootle daemon poo...@pootle.sugarlabs.org
expenses with no category specified are displayed as Unknown
fix to SL#3097
---
budgetscreen.py | 6 +-
chartscreen.py | 6 +-
po/da.po | 8
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..045a002 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
- catbox = gtk.Label(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catbox = gtk.Label('Unknown')
+ else:
+ catbox = gtk.Label(c)
catbox.set_padding(10, 0)
You can use gettext to make the Unknown label translatable. See in
the imports at the top of the file you have:
from gettext import gettext as _
The you can do:
catbox = gtk.Label(_('Unknown'))
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..fec333c 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -90,7 +90,11 @@ class ChartScreen(gtk.HBox):
hbox = gtk.HBox()
catlabel = gtk.Label()
- catlabel.set_markup(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catlabel.set_markup('Unknown')
+ else:
+ catlabel.set_markup(c)
catgroup.add_widget(catlabel)
Same here.
Also I see some trailing whitespacen in both files, would be great to
remove them to satisfy PEP8, in a separate patch.
Great to see you revisiting the trac.
Cheers,
color = finance.get_category_color_str(c)
diff --git a/po/da.po b/po/da.po
index 12a7c34..a325b80 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2011-08-08 08:54-0300\n
-PO-Revision-Date: 2011-04-08 03:26+0200\n
-Last-Translator: Aputsiaq a...@isit.gl\n
+PO-Revision-Date: 2012-03-09 11:45+0200\n
+Last-Translator: Aputsiaq Niels a...@isit.gl\n
Language-Team: LANGUAGE l...@li.org\n
-Language: \n
+Language: da\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
Plural-Forms: nplurals=2; plural=(n != 1);\n
-X-Generator: Pootle 2.0.1\n
+X-Generator: Pootle 2.0.5\n
#: activity/activity.info:2 finance.py:100
msgid Finance
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
--
.. manuq ..
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH finance] Commit from Sugar Labs: Translation System by user aputsiaq.: 31 of 31 messages translated (0 fuzzy).
hi,
2012/3/17 Manuel Quiñones ma...@laptop.org:
Hi,
El día 17 de marzo de 2012 15:04, callka...@gmail.com escribió:
From: Pootle daemon poo...@pootle.sugarlabs.org
expenses with no category specified are displayed as Unknown
fix to SL#3097
---
budgetscreen.py | 6 +-
chartscreen.py | 6 +-
po/da.po | 8
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..045a002 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
- catbox = gtk.Label(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catbox = gtk.Label('Unknown')
+ else:
+ catbox = gtk.Label(c)
catbox.set_padding(10, 0)
You can use gettext to make the Unknown label translatable. See in
the imports at the top of the file you have:
from gettext import gettext as _
The you can do:
catbox = gtk.Label(_('Unknown'))
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..fec333c 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -90,7 +90,11 @@ class ChartScreen(gtk.HBox):
hbox = gtk.HBox()
catlabel = gtk.Label()
- catlabel.set_markup(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catlabel.set_markup('Unknown')
+ else:
+ catlabel.set_markup(c)
catgroup.add_widget(catlabel)
Same here.
Also I see some trailing whitespacen in both files, would be great to
remove them to satisfy PEP8, in a separate patch.
Thanks for your suggestion. I'll follow that way.
Great to see you revisiting the trac.
I have messed with the subject of this patch. So is it ok if I send
the new patch as a separate mail?
Cheers,
color = finance.get_category_color_str(c)
diff --git a/po/da.po b/po/da.po
index 12a7c34..a325b80 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2011-08-08 08:54-0300\n
-PO-Revision-Date: 2011-04-08 03:26+0200\n
-Last-Translator: Aputsiaq a...@isit.gl\n
+PO-Revision-Date: 2012-03-09 11:45+0200\n
+Last-Translator: Aputsiaq Niels a...@isit.gl\n
Language-Team: LANGUAGE l...@li.org\n
-Language: \n
+Language: da\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
Plural-Forms: nplurals=2; plural=(n != 1);\n
-X-Generator: Pootle 2.0.1\n
+X-Generator: Pootle 2.0.5\n
#: activity/activity.info:2 finance.py:100
msgid Finance
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
--
.. manuq ..
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
--
Best Regards,
Kalpa Pathum Welivitigoda
http://about.me/callkalpa
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] RFC:Simple Help widget for activities
El día 15 de marzo de 2012 10:48, Pablo Flores pflor...@gmail.com escribió: For B. either mallard (like GNOME does) or a wiki page can be used. We can add a shortcut in the activities to open them. IIUC it would be a button that would open Browse with the activity's help pages, right? I like this idea. In this case, there should be for every activity a core documentation that keeps maintained and can be installed (for having help even being offline... and for being sure the documentation corresponds with the version of the activity and sugar that's being used). If we're going this way, having the wiki pages of activities updated would be a high priority when it comes to Sugar documentation (to be considered for the April's documentation sprint participants). It would also require this documentation to be updated every time a new version of the activity is developed with changes to the user experience (to be considered in the development cycles). Yeah, also see mallard, GNOME apps use that: http://projectmallard.org/ BTW I'm afraid jumping into the browser when looking for help may be confusing for unexperienced users, but I don't have a proposed solution for this :( We should come with a real solution for opening one activity from inside another, in a way that is not disturbing for the little user. That is, we should ensure that she/he _wants_ to do it. -- .. manuq .. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH Finance] expenses with no category specified are displayed as Unknown fix to SL#3097
From: Kalpa Pathum Welivitigoda callka...@gmail.com
---
budgetscreen.py |6 +-
chartscreen.py |7 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..bcbceb5 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
-catbox = gtk.Label(c)
+# If there is no category, display as Unknown
+if c is '':
+catbox = gtk.Label(_('Unknown'))
+else:
+catbox = gtk.Label(c)
catbox.set_padding(10, 0)
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..b6d1977 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -89,8 +89,11 @@ class ChartScreen(gtk.HBox):
for c in self.sorted_categories:
hbox = gtk.HBox()
-catlabel = gtk.Label()
-catlabel.set_markup(c)
+# If there is no category, display as Unknown
+if c is '':
+catlabel = gtk.Label(_('Unknown'))
+else:
+catlabel = gtk.Label(c)
catgroup.add_widget(catlabel)
color = finance.get_category_color_str(c)
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Wikipedia-33.5
It's a consequence of updating the data. The english wikipedia has grow from 1.5M articles in 2007 to almost 4M now [1], and the articles are longer too. I understand your concern, but we have a small option too, the Simple English Wiki [2] and we need decide what wiki activities we will include, because there are more options now (EN, SImpleEN, ES, PL, FR, RW, QU) I think SimpleEN is a better option to the EN wiki, for students with English as a second language. Gonzalo [1] http://en.wikipedia.org/wiki/History_of_Wikipedia [2] http://activities.sugarlabs.org/es-ES/sugar/addon/4547 On Sat, Mar 17, 2012 at 12:21 PM, Daniel Drake d...@laptop.org wrote: Hi Gonzalo, On Thu, Mar 15, 2012 at 9:12 AM, Sugar Labs Activities activit...@sugarlabs.org wrote: Download Now: http://activities.sugarlabs.org/downloads/file/27915/wikipedia-33.5.xo Is it intentional that this version is 55mb larger than the previous one? Thanks, Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Finance] expenses with no category specified are displayed as Unknown fix to SL#3097
Thanks Kalpa,
What do you think about replacing:
-catbox = gtk.Label(c)
+# If there is no category, display as Unknown
+if c is '':
+catbox = gtk.Label(_('Unknown'))
+else:
+catbox = gtk.Label(c)
by:
+# If there is no category, display as Unknown
+description = c
+if c is '':
+description = _('Unknown')
catbox = gtk.Label(description)
Looks simpler, right?
Gonzalo
On Sat, Mar 17, 2012 at 4:21 PM, callka...@gmail.com wrote:
From: Kalpa Pathum Welivitigoda callka...@gmail.com
---
budgetscreen.py |6 +-
chartscreen.py |7 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..bcbceb5 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
-catbox = gtk.Label(c)
+# If there is no category, display as Unknown
+if c is '':
+catbox = gtk.Label(_('Unknown'))
+else:
+catbox = gtk.Label(c)
catbox.set_padding(10, 0)
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..b6d1977 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -89,8 +89,11 @@ class ChartScreen(gtk.HBox):
for c in self.sorted_categories:
hbox = gtk.HBox()
-catlabel = gtk.Label()
-catlabel.set_markup(c)
+# If there is no category, display as Unknown
+if c is '':
+catlabel = gtk.Label(_('Unknown'))
+else:
+catlabel = gtk.Label(c)
catgroup.add_widget(catlabel)
color = finance.get_category_color_str(c)
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Finance] expenses with no category specified are displayed as Unknown fix to SL#3097
On Sun, Mar 18, 2012 at 1:06 AM, Gonzalo Odiard gonz...@laptop.org wrote:
Thanks Kalpa,
What do you think about replacing:
- catbox = gtk.Label(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catbox = gtk.Label(_('Unknown'))
+ else:
+ catbox = gtk.Label(c)
by:
+ # If there is no category, display as Unknown
+ description = c
+ if c is '':
+ description = _('Unknown')
catbox = gtk.Label(description)
Looks simpler, right?
and much better.
I've attached the new patch.
Gonzalo
On Sat, Mar 17, 2012 at 4:21 PM, callka...@gmail.com wrote:
From: Kalpa Pathum Welivitigoda callka...@gmail.com
---
budgetscreen.py | 6 +-
chartscreen.py | 7 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..bcbceb5 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
- catbox = gtk.Label(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catbox = gtk.Label(_('Unknown'))
+ else:
+ catbox = gtk.Label(c)
catbox.set_padding(10, 0)
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..b6d1977 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -89,8 +89,11 @@ class ChartScreen(gtk.HBox):
for c in self.sorted_categories:
hbox = gtk.HBox()
- catlabel = gtk.Label()
- catlabel.set_markup(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catlabel = gtk.Label(_('Unknown'))
+ else:
+ catlabel = gtk.Label(c)
catgroup.add_widget(catlabel)
color = finance.get_category_color_str(c)
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
--
Best Regards,
Kalpa Pathum Welivitigoda
http://about.me/callkalpa
From 3bc44285185d68c3fb21e166a57c9bed2794b98e Mon Sep 17 00:00:00 2001
From: Kalpa Welivitigoda callka...@gmail.com
Date: Sun, 18 Mar 2012 01:41:27 +0530
Subject: [PATCH Finance 2/2] expenses with no category specified are
displayed as Unknown fix to SL#3097
---
budgetscreen.py |6 +-
chartscreen.py |7 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..41a1dbd 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
-catbox = gtk.Label(c)
+description = c
+# If there is no category, display as Unknown
+if c is '':
+description = _('Unknown')
+catbox = gtk.Label(description)
catbox.set_padding(10, 0)
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..b984b33 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -89,8 +89,11 @@ class ChartScreen(gtk.HBox):
for c in self.sorted_categories:
hbox = gtk.HBox()
-catlabel = gtk.Label()
-catlabel.set_markup(c)
+description = c
+# If there is no category, display as Unknown
+if c is '':
+description = _('Unknown')
+catlabel = gtk.Label(description)
catgroup.add_widget(catlabel)
color = finance.get_category_color_str(c)
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH finance] Commit from Sugar Labs: Translation System by user aputsiaq.: 31 of 31 messages translated (0 fuzzy).
The PO or POT files themselves should not be patched. This will cause
the Gitorious repo to get out of synch with the local git copy
maintained by Pootle and this will require manual intervention to fix.
http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices#Do_not_touch_anything_inside_your_po_directory
Add Unknown to the code as a gettexted string and the potupdater
script will take care of regenerating the POT and the new string will
be rolled out to language projects via Update from Templates.
cjl
2012/3/17 Kalpa Welivitigoda callka...@gmail.com:
hi,
2012/3/17 Manuel Quiñones ma...@laptop.org:
Hi,
El día 17 de marzo de 2012 15:04, callka...@gmail.com escribió:
From: Pootle daemon poo...@pootle.sugarlabs.org
expenses with no category specified are displayed as Unknown
fix to SL#3097
---
budgetscreen.py | 6 +-
chartscreen.py | 6 +-
po/da.po | 8
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/budgetscreen.py b/budgetscreen.py
index 0e2cd98..045a002 100644
--- a/budgetscreen.py
+++ b/budgetscreen.py
@@ -96,7 +96,11 @@ class BudgetScreen(gtk.VBox):
# Build categories.
for c in self.sorted_categories:
- catbox = gtk.Label(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catbox = gtk.Label('Unknown')
+ else:
+ catbox = gtk.Label(c)
catbox.set_padding(10, 0)
You can use gettext to make the Unknown label translatable. See in
the imports at the top of the file you have:
from gettext import gettext as _
The you can do:
catbox = gtk.Label(_('Unknown'))
color = finance.get_category_color_str(c)
diff --git a/chartscreen.py b/chartscreen.py
index 129be9b..fec333c 100644
--- a/chartscreen.py
+++ b/chartscreen.py
@@ -90,7 +90,11 @@ class ChartScreen(gtk.HBox):
hbox = gtk.HBox()
catlabel = gtk.Label()
- catlabel.set_markup(c)
+ # If there is no category, display as Unknown
+ if c is '':
+ catlabel.set_markup('Unknown')
+ else:
+ catlabel.set_markup(c)
catgroup.add_widget(catlabel)
Same here.
Also I see some trailing whitespacen in both files, would be great to
remove them to satisfy PEP8, in a separate patch.
Thanks for your suggestion. I'll follow that way.
Great to see you revisiting the trac.
I have messed with the subject of this patch. So is it ok if I send
the new patch as a separate mail?
Cheers,
color = finance.get_category_color_str(c)
diff --git a/po/da.po b/po/da.po
index 12a7c34..a325b80 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2011-08-08 08:54-0300\n
-PO-Revision-Date: 2011-04-08 03:26+0200\n
-Last-Translator: Aputsiaq a...@isit.gl\n
+PO-Revision-Date: 2012-03-09 11:45+0200\n
+Last-Translator: Aputsiaq Niels a...@isit.gl\n
Language-Team: LANGUAGE l...@li.org\n
-Language: \n
+Language: da\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
Plural-Forms: nplurals=2; plural=(n != 1);\n
-X-Generator: Pootle 2.0.1\n
+X-Generator: Pootle 2.0.5\n
#: activity/activity.info:2 finance.py:100
msgid Finance
--
1.7.7.6
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
--
.. manuq ..
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
--
Best Regards,
Kalpa Pathum Welivitigoda
http://about.me/callkalpa
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] RFC:Simple Help widget for activities
Hi Manuel, On 17 Mar 2012, at 18:38, Manuel Quiñones wrote: El día 15 de marzo de 2012 10:48, Pablo Flores pflor...@gmail.com escribió: For B. either mallard (like GNOME does) or a wiki page can be used. We can add a shortcut in the activities to open them. IIUC it would be a button that would open Browse with the activity's help pages, right? I like this idea. In this case, there should be for every activity a core documentation that keeps maintained and can be installed (for having help even being offline... and for being sure the documentation corresponds with the version of the activity and sugar that's being used). If we're going this way, having the wiki pages of activities updated would be a high priority when it comes to Sugar documentation (to be considered for the April's documentation sprint participants). It would also require this documentation to be updated every time a new version of the activity is developed with changes to the user experience (to be considered in the development cycles). Yeah, also see mallard, GNOME apps use that: http://projectmallard.org/ BTW I'm afraid jumping into the browser when looking for help may be confusing for unexperienced users, but I don't have a proposed solution for this :( We should come with a real solution for opening one activity from inside another, in a way that is not disturbing for the little user. That is, we should ensure that she/he _wants_ to do it. I think I've mentioned this once before, but how about if we use the Sugar alert strip UI, much like we use it in Browse 'Show in Journal' when an object is downloaded? It would be something like a 'Start object_title with default_activity?' message. This would allow the user to Cancel if triggered by mistake (or maliciously/automatically), and mean the user is directly interacting with the dialogue to trigger the activity Start. It would need to be a new type of Sugar shell alert, I guess, for security (e.g. Sugar shell enforces the user interaction handover before the object is started by the new activity). Note that this generates a NEW activity object in the Journal each and every time an activity is used to launch another with an object. You would need to use the Journal (or home view) to resume an already created object if you didn't want another new instance generated (ideally the FS or datastore is/would be smart enough when identical unmodified objects are created to save storage space). Regards, --Gary -- .. manuq .. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] trisquel_5.5-20120317_i686installed to Virtualbox, 16 GB HD, using (F4) OEM install with sweets-distribution (sugar 0.94.1) added
I just installed trisquel_5.5-20120317_i686 to Virtualbox 4.1.10 , (16 GB HD,) using the (F4) OEM install. Installed sweets-distribution : http://wiki.sugarlabs.org/go/Community/Distributions/Sweets_Distribution#Ubuntu_and_its_derivates Clicked on prepare oem icon on desktop to add changes and shut down. On restart oem Trisquel set language; keyboard; location and user. All were as I set them up, with sweets-distribution as 2nd choice on login or as education/sugar in the trisquel menu. neat : ) Abrowser preferences did not change from default settings however. Tom Gilliard satellit on #trisquel and #sugar ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
