# HG changeset patch
# User bsw
# Date 1348411004 -7200
# Node ID 319161d5a9041ed8569c8dedc793c6b6ab758ff8
# Parent  a2c5707035eaddfe60f7490dd38e00816fb15ea0
Some text phrases updated

diff -r a2c5707035ea -r 319161d5a904 app/main/admin/policy_show.lua
--- a/app/main/admin/policy_show.lua	Sun Sep 23 16:31:32 2012 +0200
+++ b/app/main/admin/policy_show.lua	Sun Sep 23 16:36:44 2012 +0200
@@ -49,7 +49,7 @@
 
     ui.field.boolean{ label = _"No reverse beat path", name = "no_reverse_beat_path" }
     ui.field.boolean{ label = _"No multistage majority", name = "no_multistage_majority" }
-    ui.field.boolean{ label = _"Polling", name = "polling" }
+    ui.field.boolean{ label = _"Polling mode", name = "polling" }
 
 
     ui.field.boolean{ label = _"Active?", name = "active" }
diff -r a2c5707035ea -r 319161d5a904 app/main/initiative/_details.lua
--- a/app/main/initiative/_details.lua	Sun Sep 23 16:31:32 2012 +0200
+++ b/app/main/initiative/_details.lua	Sun Sep 23 16:36:44 2012 +0200
@@ -5,6 +5,22 @@
   record = initiative,
   readonly = true,
   content = function()
+    ui.field.text{
+      label = _"Created at",
+      value = tostring(initiative.created)
+    }
+    if initiative.revoked then
+      ui.field.text{
+         label = _"Revoked at",
+         value = format.timestamp(initiative.revoked)
+       }
+    end
+    if initiative.admitted ~= nil then
+      ui.field.boolean{ label = _"Admitted", name = "admitted" }
+    end
+    if initiative.issue.fully_frozen and initiative.polling then
+      ui.field.text{ label = _"Admitted", value = "Implicitly admitted" }
+    end
     if initiative.issue.closed then
       ui.field.boolean{ label = _"Direct majority", value = initiative.direct_majority }
       ui.field.boolean{ label = _"Indirect majority", value = initiative.indirect_majority }
@@ -25,19 +41,6 @@
       }
       ui.field.boolean{ label = _"Eligible as winner", value = initiative.eligible }
     end
-    ui.field.text{
-      label = _"Created at",
-      value = tostring(initiative.created)
-    }
-    if initiative.revoked then
-      ui.field.text{
-         label = _"Revoked at",
-         value = format.timestamp(initiative.revoked)
-       }
-    end
-    if initiative.admitted ~= nil then
-      ui.field.boolean{ label = _"Admitted", name = "admitted" }
-    end
   end
 }
 
diff -r a2c5707035ea -r 319161d5a904 app/main/initiative/_show.lua
--- a/app/main/initiative/_show.lua	Sun Sep 23 16:31:32 2012 +0200
+++ b/app/main/initiative/_show.lua	Sun Sep 23 16:36:44 2012 +0200
@@ -437,7 +437,7 @@
             :left_join("initiative", nil, "initiative.id = vote.initiative_id")
             :left_join("issue", nil, "issue.id = initiative.issue_id")
       
-      ui.anchor{ name = "voter", attr = { class = "heading" }, content = _"Member voter" }
+      ui.anchor{ name = "voter", attr = { class = "heading" }, content = _"Voters" }
       
       execute.view{
         module = "member",
diff -r a2c5707035ea -r 319161d5a904 app/main/initiative/new.lua
--- a/app/main/initiative/new.lua	Sun Sep 23 16:31:32 2012 +0200
+++ b/app/main/initiative/new.lua	Sun Sep 23 16:36:44 2012 +0200
@@ -78,7 +78,7 @@
         if available_timings then
           ui.field.select{
             label = _"Free timing",
-            name = _"free_timing",
+            name = "free_timing",
             foreign_records = available_timings,
             foreign_id = "id",
             foreign_name = "name",
@@ -132,7 +132,7 @@
     end
     
     if issue and issue.policy.polling and app.session.member:has_polling_right_for_unit_id(area.unit_id) then
-      ui.field.boolean{ name = "polling", label = _"Poll", value = polling }
+      ui.field.boolean{ name = "polling", label = _"No admission needed", value = polling }
     end
     
     if preview then
@@ -236,4 +236,4 @@
     ui.submit{ name = "preview", text = _"Preview" }
     ui.submit{ text = _"Save" }
   end
-}
\ No newline at end of file
+}
diff -r a2c5707035ea -r 319161d5a904 app/main/issue/_details.lua
--- a/app/main/issue/_details.lua	Sun Sep 23 16:31:32 2012 +0200
+++ b/app/main/issue/_details.lua	Sun Sep 23 16:36:44 2012 +0200
@@ -9,7 +9,7 @@
     ui.field.text{       label = _"Population",            name = "population" }
     ui.field.timestamp{  label = _"Created at",            name = "created" }
     if policy.polling then
-      ui.field.text{       label = _"Admission time",        value = _"Automatically admitted (poll mode)" }
+      ui.field.text{       label = _"Admission time",        value = _"Implicitly admitted" }
     else
       ui.field.text{       label = _"Admission time",        value = issue.admission_time }
       ui.field.text{