Sahana-Eden

Merge lp:~graeme-acm/sahana-eden/LA into lp:sahana-eden/la

  1. LA
  2. Merge into la
Proposed by Graeme Foster
Status: Merged
Merged at revision: 2776
Proposed branch: lp:~graeme-acm/sahana-eden/LA
Merge into: lp:sahana-eden/la
Diff against target: 117 lines (+31/-22)
2 files modified
controllers/default.py (+22/-22)
views/default/faq.html (+9/-0)
To merge this branch: bzr merge lp:~graeme-acm/sahana-eden/LA
Reviewer Review Type Date Requested Status
Fran Boon Pending
Review via email: mp+75304@code.launchpad.net

Description of the change

Fix to the translation strings when using descriptors [close the call to T()]
Added the faq.html [which appears to have been missed with the last merge]

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'controllers/default.py'
2--- controllers/default.py 2011-09-13 13:12:32 +0000
3+++ controllers/default.py 2011-09-14 05:57:26 +0000
4@@ -244,53 +244,53 @@
5 list = []
6 list.append(T("On the Home Page, click the ‘Volunteer’ link. Review the ‘List of Requests for Volunteers’. To select a %(request)s (Volunteer Task), click on %(apply)s; OR You can register by clicking the ‘Register’ link located on the top of the web page.") % dict(request="<i>%s</i>" % T("Request for Volunteers"),
7 apply = "<strong>%s</strong>" % T("‘APPLY’")))
8- list.append(T("Enter your information into the Required Fields. After you have entered your information, click %(accept)s to register." % dict(accept="<strong>%s</strong" % T("‘I ACCEPT, CREATE MY ACCOUNT’"))))
9+ list.append(T("Enter your information into the Required Fields. After you have entered your information, click %(accept)s to register.") % dict(accept="<strong>%s</strong" % T("‘I ACCEPT, CREATE MY ACCOUNT’")))
10 entry = (question, reply, list)
11 entries.append(entry)
12 question = T("How do I update my Profile, Skills and Emergency Details?")
13 reply = T("After you are signed-in, please follow these steps to edit your profile: ")
14 list = []
15- list.append(T("On the top menu, click %(volunteer)s." % dict(volunteer="<strong>%s</strong>" % T("VOLUNTEER"))))
16- list.append(T("On the left menu, click %(profile)s ." % dict(profile="<strong>%s</strong>" % T("'My Profile'"))))
17+ list.append(T("On the top menu, click %(volunteer)s.") % dict(volunteer="<strong>%s</strong>" % T("VOLUNTEER")))
18+ list.append(T("On the left menu, click %(profile)s .") % dict(profile="<strong>%s</strong>" % T("'My Profile'")))
19 list.append(T("On this page, you can update your profile."))
20- list.append(T("Additional information like %(notifications)s and other volunteer agency affiliations also can be updated in this page." % dict(notifications="<strong>%s</strong>" % T("Notifications"))))
21- list.append(T("Then click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
22- list.append(T("On the left menu, click %(skills)s." % dict(skills="<strong>%s</strong>" % T("Skills"))))
23- list.append(T("Click the %s sign next to the skill(s) that best describes how you can support the City." % "<strong>'+'</strong>"))
24+ list.append(T("Additional information like %(notifications)s and other volunteer agency affiliations also can be updated in this page.") % dict(notifications="<strong>%s</strong>" % T("Notifications")))
25+ list.append(T("Then click %(save)s") % dict(save="<strong>%s</strong>" % T("Save")))
26+ list.append(T("On the left menu, click %(skills)s.") % dict(skills="<strong>%s</strong>" % T("Skills")))
27+ list.append(T("Click the %s sign next to the skill(s) that best describes how you can support the City.") % "<strong>'+'</strong>")
28 list.append(T("You may also search for a skill by providing the first few characters in the search box. (Example: When searching for ‘Driving’ skills, enter the first letters of the word)."))
29- list.append(T("If your skill(s) is not listed, you may enter it in the %(extraSkills)s field below." % dict(extraSkills="<strong>%s</strong>" % T("Skills"))))
30- list.append(T("Then click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
31+ list.append(T("If your skill(s) is not listed, you may enter it in the %(extraSkills)s field below.") % dict(extraSkills="<strong>%s</strong>" % T("Skills")))
32+ list.append(T("Then click %(save)s") % dict(save="<strong>%s</strong>") % T("Save"))
33 list.append(T("You may also update your Emergency Contacts information by clicking on 'Emergency Contacts' located on the left menu."))
34- list.append(T("Then click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
35+ list.append(T("Then click %(save)s") % dict(save="<strong>%s</strong>") % T("Save"))
36 entry = (question, reply, list)
37 entries.append(entry)
38 question = T("How do I apply for a Volunteer Request after I have registered with Give2LA?")
39- reply = T("You can apply by clicking the %(signin)s link located on the top of the web page." % dict(signin="<strong>%s</strong>" % T("‘Sign-In’")))
40+ reply = T("You can apply by clicking the %(signin)s link located on the top of the web page.") % dict(signin="<strong>%s</strong>" % T("‘Sign-In’"))
41 list = []
42 list.append(T("Enter your E-Mail and Password information."))
43 list.append(T("Review the ‘List of Requests for Volunteers’."))
44- list.append(T("To select a Volunteer Task, click on %(apply)s."% dict(apply="<strong>%s</strong>" % T("‘APPLY’"))))
45+ list.append(T("To select a Volunteer Task, click on %(apply)s.") % dict(apply="<strong>%s</strong>") % T("‘APPLY’"))
46 list.append(T("Review the ‘Volunteer Assignment Details’. Enter your Emergency Contact information."))
47 list.append(T("Download the Give2LA Volunteer Registration Forms, complete the forms, and take them with you to your Volunteer Assignment."))
48- list.append(T("Then click %(commit)s." % dict(commit="<strong>%s</strong>" % T("Commit"))))
49+ list.append(T("Then click %(commit)s.") % dict(commit="<strong>%s</strong>") % T("Commit"))
50 list.append(T("Review the Volunteer Application details."))
51- list.append(T("Then click %(form)s and take them with you to your Volunteer Assignment." % dict(form="<strong>%s</strong>" % T("'Print Volunteer Assignment Form'"))))
52+ list.append(T("Then click %(form)s and take them with you to your Volunteer Assignment.") % dict(form="<strong>%s</strong>" % T("'Print Volunteer Assignment Form'")))
53 entry = (question, reply, list)
54 entries.append(entry)
55 question = T("Can I provide feedback or evaluation for an assignment after volunteering?")
56 reply = T("Yes. After you have signed-in, follow these steps:")
57 list = []
58- list.append(T("On the top menu, click %(volunteer)s." % dict(volunteer="<strong>%s</strong>" % T("VOLUNTEER"))))
59- list.append(T("On the left menu, click %(assignments)s." % dict(assignments="<strong>%s</strong>" % T("‘My Assignments’"))))
60+ list.append(T("On the top menu, click %(volunteer)s.") % dict(volunteer="<strong>%s</strong>") % T("VOLUNTEER"))
61+ list.append(T("On the left menu, click %(assignments)s.") % dict(assignments="<strong>%s</strong>") % T("‘My Assignments’"))
62 list.append(T("Click on the ‘Details’ button of the Volunteer Task you have completed."))
63 list.append(T("Scroll down to the bottom of the screen to get to ‘Evaluation of Event’."))
64- list.append(T("Enter the evaluation details; and click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
65+ list.append(T("Enter the evaluation details; and click %(save)s") % dict(save="<strong>%s</strong>") % T("Save"))
66 entry = (question, reply, list)
67 entries.append(entry)
68 question = T("I would like to register my corporation for donations, what is the process?")
69 reply = T("Follow these steps, to register")
70 list = []
71- list.append(T("Locate the %(register)s for Corporations and Organizations on the Home Page and click on it." % dict(register="<strong>%s</strong>" % T("‘CLICK HERE TO REGISTER’"))))
72+ list.append(T("Locate the %(register)s for Corporations and Organizations on the Home Page and click on it.") % dict(register="<strong>%s</strong>" % T("‘CLICK HERE TO REGISTER’")))
73 list.append(T("Enter the Mandatory details and click on the button %(accept)s at the bottom of the screen to register") % dict(accept="<strong>%s</strong" % T("‘I ACCEPT, CREATE MY ACCOUNT’")))
74 entry = (question, reply, list)
75 entries.append(entry)
76@@ -309,11 +309,11 @@
77 entry = (question, reply)
78 entries.append(entry)
79 question = T("What is the Privacy policy of Give2LA?")
80- reply = T("Please refer to the %(privacy)s" % dict(privacy=A(T("Privacy Policy"), _href=URL(c="default",f="disclaimer"))))
81+ reply = T("Please refer to the %(privacy)s") % dict(privacy=A(T("Privacy Policy"), _href=URL(c="default",f="disclaimer")))
82 entry = (question, reply)
83 entries.append(entry)
84 question = T("Can I bring a friend to volunteer?")
85- reply = T("Yes, but your friend must also %(register)s and apply to the same Volunteer Assignment." % dict(register=A(T("Register"), _href=URL(c="vol",f="register"))))
86+ reply = T("Yes, but your friend must also %(register)s and apply to the same Volunteer Assignment.") % dict(register=A(T("Register"), _href=URL(c="vol",f="register")))
87 entry = (question, reply)
88 entries.append(entry)
89 question = T("Will I get any food or reimbursements for expenses while volunteering?")
90@@ -321,11 +321,11 @@
91 entry = (question, reply)
92 entries.append(entry)
93 question = T("Can I donate cash to support the City of Los Angeles?")
94- reply = T("Yes, you can donate cash to the %(laepf)s who support the City of Los Angeles or other partner organizations listed on the %(donate)s. These links will take you directly to the organization’s website to complete the cash donation transaction." % dict(laepf="<a href=http://laemergencypreparednessfoundation.org/>LAEPF</a>", donate=donateLink))
95+ reply = T("Yes, you can donate cash to the %(laepf)s who support the City of Los Angeles or other partner organizations listed on the %(donate)s. These links will take you directly to the organization’s website to complete the cash donation transaction.") % dict(laepf="<a href=http://laemergencypreparednessfoundation.org/>LAEPF</a>", donate=donateLink)
96 entry = (question, reply)
97 entries.append(entry)
98 question = T("What is the process for donating in-kind Items?")
99- reply = T("The City of Los Angeles prefers cash donations. In-kind items can be donated directly to the organization(s) listed under Donate Items or through any Upcoming Donation Drive on the %(donate)s" % dict(donate=donateLink))
100+ reply = T("The City of Los Angeles prefers cash donations. In-kind items can be donated directly to the organization(s) listed under Donate Items or through any Upcoming Donation Drive on the %(donate)s") % dict(donate=donateLink)
101 entry = (question, reply)
102 entries.append(entry)
103 question = T("Do I have to be a U.S. citizen or legal U.S. resident to volunteer?")
104
105=== added file 'views/default/faq.html'
106--- views/default/faq.html 1970-01-01 00:00:00 +0000
107+++ views/default/faq.html 2011-09-14 05:57:26 +0000
108@@ -0,0 +1,9 @@
109+{{extend "layout.html"}}
110+<div id='home'>
111+<h1>{{=response.title}}</h1>
112+{{for entry in entries:}}
113+ <h2 class='paper-strip'>{{=XML(entry[0])}}</h2>
114+ <p>{{=XML(entry[1])}}<p>
115+{{pass}}
116+
117+</div>

Subscribers

People subscribed via source and target branches

to all changes: