Some more words for trasnlation, and the shanges for the modem status

haruka_theme/templates/bulksend/dashboard.html

@@ -75,7 +75,7 @@ <h4>{% trans "Message" %}</h4><blockquote id="SMS-help"><small> {% trans "for ma
 
 	<div>
 
-		<input class="btn large primary send-SMS" type="submit" value="Confirm Message">
+		<input class="btn large primary send-SMS" type="submit" value='{% trans "Confirm Message" %}'>
 	</div>
 
 

locale/tet/LC_MESSAGES/django.po

@@ -2,22 +2,50 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-11 03:51-0500\n"
+"POT-Creation-Date: 2012-06-13 00:31-0500\n"
 "PO-Revision-Date: 2012-06-12 23:53\n"
 "Last-Translator:   <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Translated-Using: django-rosetta 0.6.8\n"
 
+#: settings.py:165 haruka_theme/templates/polls/poll_dashboard.html:37
+#: haruka_theme/templates/polls/poll_dashboard.html:72
+msgid "Activity"
+msgstr "Atividade"
+
+#: settings.py:166
+msgid "Polls"
+msgstr ""
+
+#: settings.py:167 haruka_theme/templates/xforms/form_create.html:17
+msgid "Data Collection"
+msgstr "Kolekta Dadus"
+
+#: settings.py:168
+#, fuzzy
+msgid "Messaging"
+msgstr "Mensajen"
+
+#: settings.py:169 haruka_theme/templates/groups/list.html:4
+#: haruka_theme/templates/groups/list.html:9
+#: haruka_theme/templates/groups/groups/create_edit.html:24
+msgid "Groups"
+msgstr "Grupu sira"
+
+#: settings.py:170 haruka_theme/templates/registration/dashboard.html:49
+msgid "Contacts"
+msgstr "Kontaktu sira"
+
 #: haruka_theme/templates/layout.html:46
 msgid "Return to the Dashboard"
 msgstr "Fila fali ba Dashboard"
@@ -110,6 +138,11 @@ msgstr "SMS kada Mensajen"
 msgid "Per Contact"
 msgstr "Kada Kontaktu"
 
+#: haruka_theme/templates/bulksend/dashboard.html:78
+#, fuzzy
+msgid "Confirm Message"
+msgstr "Resposta mensajen"
+
 #: haruka_theme/templates/bulksend/review.html:12
 msgid "SMS Campaign Summary"
 msgstr "Sumariu Kampane SMS"
@@ -146,12 +179,6 @@ msgstr "Kustu Total:"
 msgid "Please be patient. This may take a few minutes"
 msgstr "Favor ida pasensia. Parese han tempu uitoan"
 
-#: haruka_theme/templates/groups/list.html:4
-#: haruka_theme/templates/groups/list.html:9
-#: haruka_theme/templates/groups/groups/create_edit.html:24
-msgid "Groups"
-msgstr "Grupu sira"
-
 #: haruka_theme/templates/groups/list.html:28
 msgid "add group"
 msgstr "aumenta grupu"
@@ -284,11 +311,6 @@ msgstr "Pergunta"
 msgid "Start Date"
 msgstr "Data Hahu"
 
-#: haruka_theme/templates/polls/poll_dashboard.html:37
-#: haruka_theme/templates/polls/poll_dashboard.html:72
-msgid "Activity"
-msgstr "Atividade"
-
 #: haruka_theme/templates/polls/poll_dashboard.html:38
 #: haruka_theme/templates/polls/poll_dashboard.html:73
 #: haruka_theme/templates/xforms/form_index.html:38
@@ -323,8 +345,7 @@ msgstr "Diskripsaun"
 msgid ""
 "No existing Data Collection activities.  Click on 'Data Collection' to "
 "create one."
-msgstr ""
-"La iha atividade Koleta Dadus. Click ba 'Kolekta Dadus' hodi  kria ida"
+msgstr "La iha atividade Koleta Dadus. Click ba 'Kolekta Dadus' hodi  kria ida"
 
 #: haruka_theme/templates/polls/poll_dashboard.html:103
 msgid "Latest Activity"
@@ -442,10 +463,6 @@ msgstr "Aumenta Kontaktu ida"
 msgid "Bulk Registration"
 msgstr "Volume Rejistrasaun"
 
-#: haruka_theme/templates/registration/dashboard.html:49
-msgid "Contacts"
-msgstr "Kontaktu sira"
-
 #: haruka_theme/templates/xforms/constraints.html:91
 msgid "Manage Data Constraints"
 msgstr "Maneja Limitasaun Dadus "
@@ -466,10 +483,6 @@ msgstr "Limitasaun sira "
 msgid "HarukaSMS - Data Collection"
 msgstr "HarukaSMS - Kolekta Dadus"
 
-#: haruka_theme/templates/xforms/form_create.html:17
-msgid "Data Collection"
-msgstr "Kolekta Dadus"
-
 #: haruka_theme/templates/xforms/form_create.html:17
 msgid ""
 "For more data intensive survey work design a SMS survey with keywords and "
@@ -513,7 +526,8 @@ msgid ""
 "data with each survey!"
 msgstr ""
 "Ita nia Palvra Kodigu Koletakta Dadus <blokkuota>\n"
-"<kiik> hanoin deit katak kada kaixa hanesan kuluna ida iha excel - Nune'e ho kuluna barak ita bele rekorda dadus barak ho kada survei!"
+"<kiik> hanoin deit katak kada kaixa hanesan kuluna ida iha excel - Nune'e ho "
+"kuluna barak ita bele rekorda dadus barak ho kada survei!"
 
 #: haruka_theme/templates/xforms/form_view.html:142
 msgid "Title"
@@ -543,7 +557,7 @@ msgstr ""
 msgid "Type"
 msgstr "Tipu"
 
-#: haruka_theme/templates/xforms/submissions.html:21
+#: haruka_theme/templates/xforms/submissions.html:21 poll/views.py:143
 msgid "Date"
 msgstr "Data"
 
@@ -575,6 +589,76 @@ msgstr "pergunta"
 msgid "default_response"
 msgstr ""
 
+#: poll/views.py:126 poll/views.py:143
+msgid "Text"
+msgstr ""
+
+#: poll/views.py:126 poll/views.py:143
+#, fuzzy
+msgid "Direction"
+msgstr "Diskripsaun"
+
+#: poll/views.py:126 poll/views.py:143
+msgid "Phone number"
+msgstr ""
+
+#: poll/views.py:126 poll/views.py:143
+msgid "Status"
+msgstr ""
+
+#: poll/views.py:126
+msgid "Time"
+msgstr ""
+
+#: poll/views.py:766
+msgid "All"
+msgstr ""
+
+#: poll/views.py:766
+msgid "Handled"
+msgstr ""
+
+#: poll/views.py:767
+msgid "Locked"
+msgstr ""
+
+#: poll/views.py:767
+msgid "Delivered"
+msgstr ""
+
+#: poll/views.py:768
+msgid "Incoming"
+msgstr ""
+
+#: poll/views.py:768
+msgid "Outgoing"
+msgstr ""
+
+#: poll/views.py:769
+msgid "Queued"
+msgstr ""
+
+#: poll/views.py:769
+msgid "Sent"
+msgstr ""
+
+#: poll/views.py:770 poll/views.py:772
+msgid "Received"
+msgstr ""
+
+#: poll/views.py:770
+msgid "Processing"
+msgstr ""
+
+#: poll/views.py:771
+#, fuzzy
+msgid "Cancelled"
+msgstr "kansela"
+
+#: poll/views.py:771
+msgid "Errored"
+msgstr ""
+
 #: simple_locations/models.py:31
 #, python-format
 msgid "%(lat)s, %(lon)s"

poll/views.py

@@ -29,6 +29,7 @@
 from poll.forms import ReplyForm, NewPollForm, EditPollForm, CategoryForm, RuleForm, PollTranslation
 from poll.models import Response, Poll, Translation, Category, Rule
 
+from django.utils.translation import ugettext as _
 
 def _mail_merge(contact, text):
     # use regex!!!
@@ -122,7 +123,7 @@ def dashboard(req):
             message.connection.name = Contact.objects.get(connection__identity=message.connection.identity).name
 
     # prepare for the message table
-    titles = ["Text", "Direction", "Phone number", "Status", "Time"]
+    titles = [_("Text"), _("Direction"), _("Phone number"), _("Status"), _("Time")]
     table = read_only_message_table(messages, titles)
 
     return render_to_response(
@@ -139,7 +140,7 @@ def dashboard(req):
 def latest_messages(req):
     """ return -json- HTML with latest messages """
     queryset = Message.objects.all()
-    titles = ["Text", "Direction", "Phone number", "Status", "Date"]
+    titles = [_("Text"), _("Direction"), _("Phone number"), _("Status"), _("Date")]
     table = read_only_message_table(queryset.order_by('-date')[0:15], titles)
 
     return HttpResponse(status=200, content=table)
@@ -762,15 +763,16 @@ def create_translation(request):
             context_instance=RequestContext(request))
 
 
+make_friendly = {   "A": _("All"),         "H": _("Handled"),
+                    "L": _("Locked"),      "D": _("Delivered"),
+                    "I": _("Incoming"),    "O": _("Outgoing"),
+                    "Q": _("Queued"),      "S": _("Sent"),
+                    "H": _("Received"),    "P": _("Processing"),
+                    "C": _("Cancelled"),   "E": _("Errored"),
+                    "R": _("Received"),
+                }
+
 def append_msg_row(table, message):
-    make_friendly = {   "A": "All",         "H": "Handled",
-                        "L": "Locked",      "D": "Delivered",
-                        "I": "Incoming",    "O": "Outgoing",
-                        "Q": "Queued",      "S": "Sent",
-                        "H": "Received",    "P": "Processing",
-                        "C": "Cancelled",   "E": "Errored",
-                        "R": "Received",
-                        }
     table.append("<tr><td>")
     table.append(message.text)
     table.append("</td><td>")

settings.py

@@ -158,14 +158,16 @@
 # this rapidsms-specific setting defines which views are linked by the
 # tabbed navigation. when adding an app to INSTALLED_APPS, you may wish
 # to add it here, also, to expose it in the rapidsms ui.
+
+_ = lambda s: s
 RAPIDSMS_TABS = [
     # Haruka specific
-    ('rapidsms-dashboard',                                  "Activity"),
-    ("polls",                                               "Polls"),
-    ("xforms",                                              "Data Collection"),
-    ("bulksend",                                            "Messaging"),
-    ('list-groups',                                         "Groups"),
-    ("registration",                                        "Contacts"),
+    ('rapidsms-dashboard',                                  _("Activity")),
+    ("polls",                                               _("Polls")),
+    ("xforms",                                              _("Data Collection")),
+    ("bulksend",                                            _("Messaging")),
+    ('list-groups',                                         _("Groups")),
+    ("registration",                                        _("Contacts")),
 #    ("httprouter-console",                                  "Testing"), # for use with rapidsms_httprouter
 #    ("rapidsms.contrib.messagelog.views.message_log",       "Message Log"), # can't be used with rapidsms_httprouter
 #    ("rapidsms.contrib.messaging.views.messaging",          "Messaging"),

static/haruka_theme/css/custom.css

@@ -1,10 +1,9 @@
 /* @override 
 	http://127.0.0.1:8000/static/haruka_theme/css/custom.css
 	http://10.0.1.4:8888/static/haruka_theme/css/custom.css
- */
+*/
 
-
-	body {
+body {
 		background:  url("../images/backgroundwhite.png") repeat-x fixed #B1DEEA;
 		color: #333333;
 		font: 9pt/1 "Helvetica","Arial";
@@ -1170,21 +1169,20 @@ img#download-contacts {
 
 }
 
-#modem_status {
+div.status-lights {
+	display: inline-block;
+	width: 40px;
+	height: 10px;
 	position: relative;
-	top: -95px;
-	left: 750px;
-	border: 1px solid rgba(0, 0, 0, 0.15);
-	border-radius: 4px 4px 4px 4px;
-	display: block;
-	margin: 0 0 9px;
-	padding: 8.5px;
-	white-space: pre-wrap;
-	word-wrap: break-word;
-	width: 140px;
-	height: 11px;
-	background-color: #f0f0f0;
-	display:none;
+	top: -40px;
+	right: -150px;
+}
+
+#status_red{
+	color: red;
+}
+#status_green{
+	color: green;
 }
 
 div.well.span7 {