Merge lp:~mhall119/loco-team-portal/fixes-609695 into lp:loco-team-portal

[Michael Hall]

Adds a block next to the Global Events list that briefly describes how to add an event, or register attendance for an existing event.

[Daniel Holbach (dholbach)]

Can we get somebody from the LoCo Council to review the text? Can we add something like a step-by-step explanation too? Maybe a bit like https://wiki.ubuntu.com/UbuntuGlobalJam/Events?

Also can we try to avoid to use blocktrans? If you ./manage.py update-template and check the diff of the .pot file you see what I mean. It's not easily translatable and invites all kinds of mistakes. Maybe we can make it all separate trans entries? Kind of like templates/loco_council.html

review: Needs Fixing

[YoBoY (yoboy-leguesh)]

Regarding the text :

"Events are a great way for Ubuntu users to meet and socialize in person." the "in person" seems too much for me.

"If you can attend one of these events, you should register your attendance on the event's page. You can also leave comments on a team event, both before or after it takes place.", it's not an obligation to register on an event, i don't like the "you should". I prefer something like "If you plan to go on an event, you can register your attendance and leave comments before the event or after it takes place."

"global eventyour team" miss a space

[Michael Hall (mhall119)]

We meet and socialize quite a bit online, so I thought the "in person" would help to distinguish these as "in real life" events.

[Michael Hall (mhall119)]

I'm not sure how "you should" translates into there languages, but it usually means "Not required, but highly recommended". We would like to see people register as much as possible, so I didn't want to leave it sounding like it didn't matter if they did or not.

[Laura Czajkowski (czajkowski)]

"Events are a great way for Ubuntu users to meet and socialize with people in person.

If you can attend one of these events, you should register your attendance on the event's page in question that you want to attend. You can also leave comments on a team event, both before or after the event takes place.

 "If you are a member of an Ubuntu LoCo Team, you can create an event by adding it for your team by clicking the link at the top of this page, or by selecting a global even that your team will be participating in, and clicking the link to add your team's event.

Having reviewed the above this is what I'd suggest.

Unmerged revisions

203. By Michael Hall on 2010-07-29

Switch from one blocktrans to three trans to make translating easier

202. By Michael Hall on 2010-07-29

Add short explanation for adding an event or registering attendence for an event

=== modified file 'loco_directory/templates/events/event_list.html'
--- loco_directory/templates/events/event_list.html	2010-06-24 19:18:57 +0000
+++ loco_directory/templates/events/event_list.html	2010-07-29 12:12:47 +0000
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<article class="minor-content">
 <h2>{% trans "Ubuntu LoCo Global Events" %}{% if global_event_list %} <a title="{% trans "Global Events as ical" %}" class="global_event_ical" href="{% url global-event-list-ical %}"></a>{% endif %}</h2>
 
 {% if global_event_list %}
@@ -33,6 +33,21 @@
 {% endif %}
 </article>
 
+<article class="minor-content alone">
+<h2>{% trans "Add or Attend an Event" %}</h2>
+
+<p>
+{% trans "Events are a great way for Ubuntu users to meet and socialize in person." %}
+</p>
+<p>
+{% trans "If you can attend one of these events, you should register your attendance on the event's page. You can also leave comments on a team event, both before or after it takes place." %}
+</p>
+<p>
+{% trans "If you are a member of an Ubuntu LoCo Team, you can add an event for your team by clicking the link at the top of this page, or by selecting a global eventyour team will be participating in, and clicking the link to add your team's event." %}
+</p>
+
+</article>
+
 <hr class="divide" />
 
 <article class="main-content">