Changeset 871:9dfeea390bd7


Ignore:
Timestamp:
08/22/10 21:35:07 (3 years ago)
Author:
fl
Branch:
trunk
Message:

[svn r1217] unify variant html snippet

Location:
adhocracy
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • adhocracy/i18n/adhocracy.pot

    r870 r871  
    99"Project-Id-Version: adhocracy 1.1\n" 
    1010"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    11 "POT-Creation-Date: 2010-08-22 20:58+0200\n" 
     11"POT-Creation-Date: 2010-08-22 21:32+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    … …  
    635635msgstr "" 
    636636 
     637#: adhocracy/lib/event/formatting.py:98 
     638msgid "is for" 
     639msgstr "" 
     640 
    637641#: adhocracy/lib/event/formatting.py:99 
    638 msgid "is for" 
     642msgid "abstains on" 
    639643msgstr "" 
    640644 
    641645#: adhocracy/lib/event/formatting.py:100 
    642 msgid "abstains on" 
    643 msgstr "" 
    644  
    645 #: adhocracy/lib/event/formatting.py:101 
    646646msgid "is against" 
    647647msgstr "" 
    648648 
    649 #: adhocracy/lib/event/formatting.py:142 adhocracy/lib/event/formatting.py:147 
    650 #: adhocracy/lib/event/formatting.py:154 adhocracy/model/refs.py:101 
     649#: adhocracy/lib/event/formatting.py:141 adhocracy/lib/event/formatting.py:146 
     650#: adhocracy/lib/event/formatting.py:153 adhocracy/model/refs.py:101 
    651651msgid "(Undefined)" 
    652652msgstr "" 
    … …  
    14661466msgstr "" 
    14671467 
    1468 #: adhocracy/templates/comment/tiles.html:233 adhocracy/templates/page/show.html:33 
     1468#: adhocracy/templates/comment/tiles.html:233 
    14691469msgid "history" 
    14701470msgstr "" 
    … …  
    14841484 
    14851485#: adhocracy/templates/comment/tiles.html:268 adhocracy/templates/page/show.html:22 
    1486 #: adhocracy/templates/proposal/tiles.html:41 
     1486#: adhocracy/templates/page/show.html:30 adhocracy/templates/proposal/tiles.html:41 
    14871487#: adhocracy/templates/text/tiles.html:127 
    14881488msgid "History" 
    … …  
    20412041 
    20422042#: adhocracy/templates/instance/show.html:40 
    2043 #: adhocracy/templates/instance/tiles.html:24 adhocracy/templates/page/show.html:56 
     2043#: adhocracy/templates/instance/tiles.html:24 adhocracy/templates/page/show.html:53 
    20442044#: adhocracy/templates/proposal/index.html:11 
    20452045#: adhocracy/templates/proposal/index.html:69 adhocracy/templates/tag/show.html:11 
    … …  
    20492049 
    20502050#: adhocracy/templates/instance/show.html:40 
    2051 #: adhocracy/templates/instance/tiles.html:24 adhocracy/templates/page/show.html:56 
     2051#: adhocracy/templates/instance/tiles.html:24 adhocracy/templates/page/show.html:53 
    20522052#: adhocracy/templates/proposal/index.html:11 
    20532053#: adhocracy/templates/proposal/index.html:69 adhocracy/templates/tag/show.html:11 
    … …  
    22122212msgstr "" 
    22132213 
    2214 #: adhocracy/templates/page/diff.html:48 adhocracy/templates/page/show.html:42 
     2214#: adhocracy/templates/page/diff.html:48 adhocracy/templates/page/show.html:39 
    22152215msgid "Related Proposals" 
    22162216msgstr "" 
    … …  
    23142314msgstr "" 
    23152315 
    2316 #: adhocracy/templates/page/show.html:32 
     2316#: adhocracy/templates/page/show.html:29 
    23172317#, python-format 
    23182318msgid "Page created on %s by %s" 
    23192319msgstr "" 
    23202320 
    2321 #: adhocracy/templates/page/show.html:45 
     2321#: adhocracy/templates/page/show.html:42 
    23222322#, python-format 
    23232323msgid "No proposals are related to %s" 
    … …  
    23682368msgstr "" 
    23692369 
    2370 #: adhocracy/templates/page/tiles.html:98 
    2371 #, python-format 
    2372 msgid "Norm: %s" 
     2370#: adhocracy/templates/page/tiles.html:99 
     2371#, python-format 
     2372msgid "Variant %s of %s" 
     2373msgstr "" 
     2374 
     2375#: adhocracy/templates/page/tiles.html:101 
     2376#, python-format 
     2377msgid "Variant of %s" 
    23732378msgstr "" 
    23742379 

  • adhocracy/i18n/de/LC_MESSAGES/adhocracy.po

    r870 r871  
    99"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    1010"POT-Creation-Date: 2009-11-26 12:16+0100\n" 
    11 "PO-Revision-Date: 2010-08-22 21:05+0100\n" 
     11"PO-Revision-Date: 2010-08-22 21:32+0100\n" 
    1212"Last-Translator: Friedrich Lindenberg <friedrich@pudo.org>\n" 
    1313"Language-Team: de <team@adhocracy.de>\n" 
    … …  
    648648msgstr "Variante %(variant)s von %(page)s" 
    649649 
    650 #: adhocracy/lib/event/formatting.py:99 
     650#: adhocracy/lib/event/formatting.py:98 
    651651msgid "is for" 
    652652msgstr "ist fÃŒr" 
    653653 
    654 #: adhocracy/lib/event/formatting.py:100 
     654#: adhocracy/lib/event/formatting.py:99 
    655655msgid "abstains on" 
    656656msgstr "enthÀltet sich bei" 
    657657 
    658 #: adhocracy/lib/event/formatting.py:101 
     658#: adhocracy/lib/event/formatting.py:100 
    659659msgid "is against" 
    660660msgstr "ist gegen" 
    661661 
    662 #: adhocracy/lib/event/formatting.py:142 
    663 #: adhocracy/lib/event/formatting.py:147 
    664 #: adhocracy/lib/event/formatting.py:154 
     662#: adhocracy/lib/event/formatting.py:141 
     663#: adhocracy/lib/event/formatting.py:146 
     664#: adhocracy/lib/event/formatting.py:153 
    665665#: adhocracy/model/refs.py:101 
    666666msgid "(Undefined)" 
    … …  
    15121512 
    15131513#: adhocracy/templates/comment/tiles.html:233 
    1514 #: adhocracy/templates/page/show.html:33 
    15151514msgid "history" 
    15161515msgstr "Historie" 
    … …  
    15311530#: adhocracy/templates/comment/tiles.html:268 
    15321531#: adhocracy/templates/page/show.html:22 
     1532#: adhocracy/templates/page/show.html:30 
    15331533#: adhocracy/templates/proposal/tiles.html:41 
    15341534#: adhocracy/templates/text/tiles.html:127 
    … …  
    20692069#: adhocracy/templates/instance/show.html:40 
    20702070#: adhocracy/templates/instance/tiles.html:24 
    2071 #: adhocracy/templates/page/show.html:56 
     2071#: adhocracy/templates/page/show.html:53 
    20722072#: adhocracy/templates/proposal/index.html:11 
    20732073#: adhocracy/templates/proposal/index.html:69 
    … …  
    20792079#: adhocracy/templates/instance/show.html:40 
    20802080#: adhocracy/templates/instance/tiles.html:24 
    2081 #: adhocracy/templates/page/show.html:56 
     2081#: adhocracy/templates/page/show.html:53 
    20822082#: adhocracy/templates/proposal/index.html:11 
    20832083#: adhocracy/templates/proposal/index.html:69 
    … …  
    22412241 
    22422242#: adhocracy/templates/page/diff.html:48 
    2243 #: adhocracy/templates/page/show.html:42 
     2243#: adhocracy/templates/page/show.html:39 
    22442244msgid "Related Proposals" 
    22452245msgstr "Verwandte VorschlÀge" 
    … …  
    23532353msgstr "Varianten" 
    23542354 
    2355 #: adhocracy/templates/page/show.html:32 
     2355#: adhocracy/templates/page/show.html:29 
    23562356#, python-format 
    23572357msgid "Page created on %s by %s" 
    23582358msgstr "Seite wurde am %s von %s angelegt." 
    23592359 
    2360 #: adhocracy/templates/page/show.html:45 
     2360#: adhocracy/templates/page/show.html:42 
    23612361#, python-format 
    23622362msgid "No proposals are related to %s" 
    … …  
    24082408msgstr "variante entfernen" 
    24092409 
    2410 #: adhocracy/templates/page/tiles.html:98 
    2411 #, python-format 
    2412 msgid "Norm: %s" 
    2413 msgstr "Norm: %s" 
     2410#: adhocracy/templates/page/tiles.html:99 
     2411#, python-format 
     2412#| msgid "variant %(variant)s of %(page)s" 
     2413msgid "Variant %s of %s" 
     2414msgstr "Variante %s von %s" 
     2415 
     2416#: adhocracy/templates/page/tiles.html:101 
     2417#, python-format 
     2418#| msgid "Variant: %s" 
     2419msgid "Variant of %s" 
     2420msgstr "Variante von %s" 
    24142421 
    24152422#: adhocracy/templates/poll/ask_delete.html:6 
    … …  
    26072614#: adhocracy/templates/proposal/show.html:53 
    26082615msgid "change exisitng norm" 
    2609 msgstr "bestehende norm Àndern" 
     2616msgstr "Bestehende Norm Àndern" 
    26102617 
    26112618#: adhocracy/templates/proposal/show.html:54 
    2612 #| msgid "Propose to change a norm through this proposal." 
    26132619msgid "Propose to create a norm through this proposal." 
    26142620msgstr "Schlage die Änderung einer Norm durch diesen Vorschlag vor." 
    26152621 
    26162622#: adhocracy/templates/proposal/show.html:55 
    2617 #| msgid "see norm" 
    26182623msgid "propose new norm" 
    26192624msgstr "neue norm vorschlagen" 
    … …  
    27552760 
    27562761#: adhocracy/templates/selection/include.html:24 
    2757 #| msgid "I want to include a change to an existing norm." 
    27582762msgid "Change an exisisting norm" 
    27592763msgstr "bestehende norm Àndern" 
    27602764 
    27612765#: adhocracy/templates/selection/include.html:26 
    2762 #| msgid "" "Select a norm that you want to relate to. You can later write a 
    2763 #| variant " "of this norm to propose a change." 
    27642766msgid "Select a norm that you want to relate to. You can later propose a variant of this norm to effect a change." 
    27652767msgstr "WÀhle eine Norm, auf die Du Dich beziehen willst. SpÀter kannst Du eine Variante der Norm schreiben, um eine Änderung vorzuschlagen." 
    … …  
    27742776 
    27752777#: adhocracy/templates/selection/include.html:41 
    2776 #| msgid "Create a new proposal..." 
    27772778msgid "Create a new norm instead" 
    27782779msgstr "Lege stattdessen eine neue Norm an" 
    27792780 
    27802781#: adhocracy/templates/selection/propose.html:24 
    2781 #| msgid "see norm" 
    27822782msgid "Propose a new norm" 
    27832783msgstr "Neue norm vorschlagen" 
    27842784 
    27852785#: adhocracy/templates/selection/propose.html:26 
    2786 #| msgid "" "The implementation of a proposal is amended by relating to a fixed 
    2787 #| " "document, a norm. Please select or create the norm that you want to " 
    2788 #| "relate to. You can then add a text variant of that norm, specifying the " 
    2789 #| "change you want to implement." 
    27902786msgid "Create a new norm that you want to relate to. The norm will be created without any status quo. You can then add a text variant of that norm, specifying the change you want to implement." 
    27912787msgstr "Lege eine neue Norm an, auf die Du Bezug nehmen willst. Die Norm wird zunÀchst keinen Status Quo haben. Du kannst anschließend eine Variante der Norm anlegen, um einen Text vorzuschlagen." 
    … …  
    28042800 
    28052801#: adhocracy/templates/selection/propose.html:51 
    2806 #| msgid "I want to include a change to an existing norm." 
    28072802msgid "Include an existing norm instead" 
    28082803msgstr "Schlage die Änderung einer bestehenden Norm vor" 
    … …  
    32753270msgstr "Wie kann man etwas beobachten?" 
    32763271 
    3277 #~ msgid "amend implementation" 
    3278 #~ msgstr "Umsetzung ergÀnzen" 
    3279 #~ msgid "" 
    3280 #~ "Proposals are implemented by including " 
    3281 #~ "changes towards new or existing norm." 
    3282 #~ " Amend the proposal to change or " 
    3283 #~ "create a norm." 
    3284 #~ msgstr "" 
    3285 #~ "VorschlÀge werden umgesetzt, indem ihnen " 
    3286 #~ "Änderungen zu einer bestehenden oder " 
    3287 #~ "neuen Norm zugewiesen werden. ErgÀnze " 
    3288 #~ "den Vorschlag um ihn auf eine Norm" 
    3289 #~ " zu beziehen. " 
    3290 #~ msgid "I want to propose the creation of a new norm." 
    3291 #~ msgstr "Ich möchte eine <b>neue</b> Norm zur Umsetzung hinzufÃŒgen." 
    3292  
     3272#~ msgid "Norm: %s" 
     3273#~ msgstr "Norm: %s" 
     3274 

  • adhocracy/i18n/en/LC_MESSAGES/adhocracy.po

    r870 r871  
    99"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    1010"POT-Creation-Date: 2009-11-26 12:16+0100\n" 
    11 "PO-Revision-Date: 2010-08-22 20:59+0200\n" 
     11"PO-Revision-Date: 2010-08-22 21:32+0200\n" 
    1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    1313"Language-Team: en <LL@li.org>\n" 
    … …  
    641641msgstr "" 
    642642 
    643 #: adhocracy/lib/event/formatting.py:99 
     643#: adhocracy/lib/event/formatting.py:98 
    644644#, fuzzy 
    645645msgid "is for" 
    646646msgstr "" 
    647647 
     648#: adhocracy/lib/event/formatting.py:99 
     649msgid "abstains on" 
     650msgstr "" 
     651 
    648652#: adhocracy/lib/event/formatting.py:100 
    649 msgid "abstains on" 
    650 msgstr "" 
    651  
    652 #: adhocracy/lib/event/formatting.py:101 
    653653msgid "is against" 
    654654msgstr "" 
    655655 
    656 #: adhocracy/lib/event/formatting.py:142 adhocracy/lib/event/formatting.py:147 
    657 #: adhocracy/lib/event/formatting.py:154 adhocracy/model/refs.py:101 
     656#: adhocracy/lib/event/formatting.py:141 adhocracy/lib/event/formatting.py:146 
     657#: adhocracy/lib/event/formatting.py:153 adhocracy/model/refs.py:101 
    658658msgid "(Undefined)" 
    659659msgstr "" 
    … …  
    14931493 
    14941494#: adhocracy/templates/comment/tiles.html:233 
    1495 #: adhocracy/templates/page/show.html:33 
    14961495msgid "history" 
    14971496msgstr "" 
    … …  
    15111510 
    15121511#: adhocracy/templates/comment/tiles.html:268 
    1513 #: adhocracy/templates/page/show.html:22 
     1512#: adhocracy/templates/page/show.html:22 adhocracy/templates/page/show.html:30 
    15141513#: adhocracy/templates/proposal/tiles.html:41 
    15151514#: adhocracy/templates/text/tiles.html:127 
    … …  
    20762075#: adhocracy/templates/instance/show.html:40 
    20772076#: adhocracy/templates/instance/tiles.html:24 
    2078 #: adhocracy/templates/page/show.html:56 
     2077#: adhocracy/templates/page/show.html:53 
    20792078#: adhocracy/templates/proposal/index.html:11 
    20802079#: adhocracy/templates/proposal/index.html:69 
    … …  
    20852084#: adhocracy/templates/instance/show.html:40 
    20862085#: adhocracy/templates/instance/tiles.html:24 
    2087 #: adhocracy/templates/page/show.html:56 
     2086#: adhocracy/templates/page/show.html:53 
    20882087#: adhocracy/templates/proposal/index.html:11 
    20892088#: adhocracy/templates/proposal/index.html:69 
    … …  
    22572256msgstr "" 
    22582257 
    2259 #: adhocracy/templates/page/diff.html:48 adhocracy/templates/page/show.html:42 
     2258#: adhocracy/templates/page/diff.html:48 adhocracy/templates/page/show.html:39 
    22602259#, fuzzy 
    22612260msgid "Related Proposals" 
    … …  
    23672366msgstr "" 
    23682367 
    2369 #: adhocracy/templates/page/show.html:32 
     2368#: adhocracy/templates/page/show.html:29 
    23702369#, python-format 
    23712370msgid "Page created on %s by %s" 
    23722371msgstr "" 
    23732372 
    2374 #: adhocracy/templates/page/show.html:45 
     2373#: adhocracy/templates/page/show.html:42 
    23752374#, python-format 
    23762375msgid "No proposals are related to %s" 
    … …  
    24212420msgstr "" 
    24222421 
    2423 #: adhocracy/templates/page/tiles.html:98 
    2424 #, python-format 
    2425 msgid "Norm: %s" 
     2422#: adhocracy/templates/page/tiles.html:99 
     2423#, python-format 
     2424msgid "Variant %s of %s" 
     2425msgstr "" 
     2426 
     2427#: adhocracy/templates/page/tiles.html:101 
     2428#, python-format 
     2429msgid "Variant of %s" 
    24262430msgstr "" 
    24272431 
    … …  
    33193323msgstr "" 
    33203324 
    3321 #~ msgid "amend implementation" 
     3325#~ msgid "Norm: %s" 
    33223326#~ msgstr "" 
    33233327 
    3324 #~ msgid "" 
    3325 #~ "Proposals are implemented by including " 
    3326 #~ "changes towards new or existing norm." 
    3327 #~ " Amend the proposal to change or " 
    3328 #~ "create a norm." 
    3329 #~ msgstr "" 
    3330  
    3331 #~ msgid "" 
    3332 #~ "The implementation of a proposal is " 
    3333 #~ "amended by relating to a fixed " 
    3334 #~ "document, a norm. Please select or " 
    3335 #~ "create the norm that you want to" 
    3336 #~ " relate to. You can then add a" 
    3337 #~ " text variant of that norm, " 
    3338 #~ "specifying the change you want to " 
    3339 #~ "implement." 
    3340 #~ msgstr "" 
    3341  
    3342 #~ msgid "I want to include a change to an existing norm." 
    3343 #~ msgstr "" 
    3344  
    3345 #~ msgid "" 
    3346 #~ "Select a norm that you want to " 
    3347 #~ "relate to. You can later write a" 
    3348 #~ " variant of this norm to propose " 
    3349 #~ "a change." 
    3350 #~ msgstr "" 
    3351  
    3352 #~ msgid "I want to propose the creation of a new norm." 
    3353 #~ msgstr "" 
    3354  

  • adhocracy/i18n/fr/LC_MESSAGES/adhocracy.po

    r870 r871  
    99"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    1010"POT-Creation-Date: 2009-11-26 12:16+0100\n" 
    11 "PO-Revision-Date: 2010-08-22 20:59+0200\n" 
     11"PO-Revision-Date: 2010-08-22 21:32+0200\n" 
    1212"Last-Translator: Benjamin Claverie <ben@skl8em.com>\n" 
    1313"Language-Team: \n" 
    … …  
    674674msgstr "motion: %(variant)s de %(page)s" 
    675675 
    676 #: adhocracy/lib/event/formatting.py:99 
     676#: adhocracy/lib/event/formatting.py:98 
    677677#, fuzzy 
    678678msgid "is for" 
    679679msgstr "pour" 
    680680 
    681 #: adhocracy/lib/event/formatting.py:100 
     681#: adhocracy/lib/event/formatting.py:99 
    682682#, fuzzy 
    683683msgid "abstains on" 
    684684msgstr "abstenu" 
    685685 
    686 #: adhocracy/lib/event/formatting.py:101 
     686#: adhocracy/lib/event/formatting.py:100 
    687687#, fuzzy 
    688688msgid "is against" 
    689689msgstr "contre" 
    690690 
    691 #: adhocracy/lib/event/formatting.py:142 adhocracy/lib/event/formatting.py:147 
    692 #: adhocracy/lib/event/formatting.py:154 adhocracy/model/refs.py:101 
     691#: adhocracy/lib/event/formatting.py:141 adhocracy/lib/event/formatting.py:146 
     692#: adhocracy/lib/event/formatting.py:153 adhocracy/model/refs.py:101 
    693693msgid "(Undefined)" 
    694694msgstr "(non définit)" 
    … …  
    15341534 
    15351535#: adhocracy/templates/comment/tiles.html:233 
    1536 #: adhocracy/templates/page/show.html:33 
    15371536msgid "history" 
    15381537msgstr "historique" 
    … …  
    15531552 
    15541553#: adhocracy/templates/comment/tiles.html:268 
    1555 #: adhocracy/templates/page/show.html:22 
     1554#: adhocracy/templates/page/show.html:22 adhocracy/templates/page/show.html:30 
    15561555#: adhocracy/templates/proposal/tiles.html:41 
    15571556#: adhocracy/templates/text/tiles.html:127 
    … …  
    21482147#: adhocracy/templates/instance/show.html:40 
    21492148#: adhocracy/templates/instance/tiles.html:24 
    2150 #: adhocracy/templates/page/show.html:56 
     2149#: adhocracy/templates/page/show.html:53 
    21512150#: adhocracy/templates/proposal/index.html:11 
    21522151#: adhocracy/templates/proposal/index.html:69 
    … …  
    21572156#: adhocracy/templates/instance/show.html:40 
    21582157#: adhocracy/templates/instance/tiles.html:24 
    2159 #: adhocracy/templates/page/show.html:56 
     2158#: adhocracy/templates/page/show.html:53 
    21602159#: adhocracy/templates/proposal/index.html:11 
    21612160#: adhocracy/templates/proposal/index.html:69 
    … …  
    23342333msgstr "Cette révision n'a pas de texte." 
    23352334 
    2336 #: adhocracy/templates/page/diff.html:48 adhocracy/templates/page/show.html:42 
     2335#: adhocracy/templates/page/diff.html:48 adhocracy/templates/page/show.html:39 
    23372336msgid "Related Proposals" 
    23382337msgstr "Proposition proche" 
    … …  
    24492448msgstr "Motions" 
    24502449 
    2451 #: adhocracy/templates/page/show.html:32 
     2450#: adhocracy/templates/page/show.html:29 
    24522451#, python-format 
    24532452msgid "Page created on %s by %s" 
    24542453msgstr "Page créé par %s sur %s" 
    24552454 
    2456 #: adhocracy/templates/page/show.html:45 
     2455#: adhocracy/templates/page/show.html:42 
    24572456#, fuzzy, python-format 
    24582457msgid "No proposals are related to %s" 
    … …  
    25062505msgstr "nouvelle motion" 
    25072506 
    2508 #: adhocracy/templates/page/tiles.html:98 
     2507#: adhocracy/templates/page/tiles.html:99 
    25092508#, fuzzy, python-format 
    2510 msgid "Norm: %s" 
    2511 msgstr "de %s" 
     2509#| msgid "variant %(variant)s of %(page)s" 
     2510msgid "Variant %s of %s" 
     2511msgstr "motion: %(variant)s de %(page)s" 
     2512 
     2513#: adhocracy/templates/page/tiles.html:101 
     2514#, fuzzy, python-format 
     2515#| msgid "Variant: %s" 
     2516msgid "Variant of %s" 
     2517msgstr "Motion: %s" 
    25122518 
    25132519#: adhocracy/templates/poll/ask_delete.html:6 
    … …  
    27332739#: adhocracy/templates/proposal/show.html:54 
    27342740#, fuzzy 
    2735 #| msgid "Propose to change a norm through this proposal." 
    27362741msgid "Propose to create a norm through this proposal." 
    27372742msgstr "Proposé de changer une rÚgle par cette proposition." 
    … …  
    27392744#: adhocracy/templates/proposal/show.html:55 
    27402745#, fuzzy 
    2741 #| msgid "see norm" 
    27422746msgid "propose new norm" 
    27432747msgstr "voir rÚgle" 
    … …  
    28822886#: adhocracy/templates/selection/include.html:24 
    28832887#, fuzzy 
    2884 #| msgid "I want to include a change to an existing norm." 
    28852888msgid "Change an exisisting norm" 
    28862889msgstr "Je veux inclure un changement à une rÚgle existante. " 
    … …  
    29022905#: adhocracy/templates/selection/include.html:41 
    29032906#, fuzzy 
    2904 #| msgid "Create a new proposal..." 
    29052907msgid "Create a new norm instead" 
    29062908msgstr "Créer une nouvelle proposition" 
    … …  
    29082910#: adhocracy/templates/selection/propose.html:24 
    29092911#, fuzzy 
    2910 #| msgid "see norm" 
    29112912msgid "Propose a new norm" 
    29122913msgstr "voir rÚgle" 
    … …  
    29142915#: adhocracy/templates/selection/propose.html:26 
    29152916#, fuzzy 
    2916 #| msgid "" "The implementation of a proposal is amended by relating to a fixed 
    2917 #| " "document, a norm. Please select or create the norm that you want to " 
    2918 #| "relate to. You can then add a text variant of that norm, specifying the " 
    2919 #| "change you want to implement." 
    29202917msgid "" 
    29212918"Create a new norm that you want to relate to. The norm will be created " 
    … …  
    29442941#: adhocracy/templates/selection/propose.html:51 
    29452942#, fuzzy 
    2946 #| msgid "I want to include a change to an existing norm." 
    29472943msgid "Include an existing norm instead" 
    29482944msgstr "Je veux inclure un changement à une rÚgle existante. " 
    … …  
    34593455msgstr "Comment créer une observation?" 
    34603456 
    3461 #~ msgid "amend implementation" 
    3462 #~ msgstr "amender cette implementation." 
    3463  
    3464 #~ msgid "" 
    3465 #~ "Proposals are implemented by including " 
    3466 #~ "changes towards new or existing norm." 
    3467 #~ " Amend the proposal to change or " 
    3468 #~ "create a norm." 
    3469 #~ msgstr "" 
    3470 #~ "Des propositions sont mise en oeuvre " 
    3471 #~ "en incluant des amendements à des " 
    3472 #~ "rÚgles existantes ou nouvelles. Amender " 
    3473 #~ "la proposition pour changer ou créer " 
    3474 #~ "la rÚgle concerné." 
    3475  
    3476 #~ msgid "" 
    3477 #~ "Select a norm that you want to " 
    3478 #~ "relate to. You can later write a" 
    3479 #~ " variant of this norm to propose " 
    3480 #~ "a change." 
    3481 #~ msgstr "" 
    3482  
    3483 #~ msgid "I want to propose the creation of a new norm." 
    3484 #~ msgstr "Je veux proposer la création d'une nouvelle rÚgle." 
    3485  
     3457#~ msgid "Norm: %s" 
     3458#~ msgstr "de %s" 
     3459 

  • adhocracy/lib/event/formatting.py

    r847 r871  
    5959        if poll.action == poll.SELECT:  
    6060            text = poll.selection.page.variant_head(poll.variant) 
    61             variant_link = "<a href='%s'>%s</a>" % (h.text.url(text),  
    62                                                     cgi.escape(text.variant_name)) 
     61            variant_link = "<a href='%s'>%s</a>" % (h.text.url(text), text.variant_html) 
    6362            page_link = h.page.link(poll.selection.page, icon=True, icon_size=16) 
    6463            return self.SELECT_PATTERN(variant_link, page_link) 

  • adhocracy/lib/tiles/decision_tiles.py

    r859 r871  
    1919        if self.poll.action == self.poll.SELECT and self.poll.selection: 
    2020            text = self.poll.selection.page.variant_head(self.poll.variant) 
    21             variant_link = "<a href='%s'><code>%s</code></a>" % (h.text.url(text), cgi.escape(text.variant_name)) 
     21            variant_link = "<a href='%s'>%s</a>" % (h.text.url(text), text.variant_html) 
    2222            page_link = h.page.link(self.poll.scope) 
    2323            return _("variant %(variant)s of %(page)s") % dict(variant=variant_link, page=page_link) 

  • adhocracy/model/text.py

    r861 r871  
    130130            return _("Status Quo") 
    131131        return self.variant 
    132      
     132         
     133    @property 
     134    def variant_html(self): 
     135        import cgi 
     136        if self.is_head: 
     137            return "<b class='varname'>%s</b>" % cgi.escape(self.variant_name) 
     138        return"<code class='varname'>%s</code>" % cgi.escape(self.variant_name) 
    133139     
    134140    @property  

  • adhocracy/static/style/base.css

    r868 r871  
    723723} 
    724724 
     725code.varname, b.varname { 
     726        font-family: "lucida grande", "Verdana", arial, sans-serif; 
     727        font-variant: small-caps; 
     728} 
    725729 
    726730.line_based tr, 

  • adhocracy/templates/page/show.html

    r867 r871  
    1818                        %> 
    1919                        <li> 
    20                                 %if variant == c.model.Text.HEAD: 
    21                                         <b>${text.variant_name}</b> &middot; 
    22                                         <a href="${h.page.url(c.page, member='history')}">${_("History")}</a> 
    23                                 %else: 
    24                                         <a href="${h.entity_url(text)}"><code>${variant}</code></a> 
    25                                 %endif 
     20                            <a href="${h.entity_url(text)}">${text.variant_html|n}</a>  
     21                                &middot; 
     22                                <a href="${h.page.url(c.page, member='history')}">${_("History")}</a> 
    2623                        </li> 
    2724                %endfor 
    … …  
    3128                <div class="infobox"> 
    3229                        ${_("Page created on %s by %s") % (h.format_date(c.page.create_time), h.user.link(c.page.creator))|n}  
    33                         &middot; <a href="${h.entity_url(c.page, member='history')}">${_("history")}</a> 
     30                        &middot; <a href="${h.entity_url(c.page, member='history')}">${_("History")}</a> 
    3431                </div> 
    3532                <br/> 

  • adhocracy/templates/page/tiles.html

    r867 r871  
    9595        <h1 class="page_title"> 
    9696        %if text.variant != text.HEAD: 
    97                 <img class="cd" src="/img/icons/page_variant_24.png" /> 
    98                 ${_("Norm: %s") % text.title} 
     97            <img class="cd" src="/img/icons/page_variant_24.png" /> 
     98            %if c.variant: 
     99                    ${_("Variant %s of %s") % (text.variant_html, text.title)|n} 
     100            %else: 
     101                ${_("Variant of %s") % (text.title,)} 
     102            %endif 
    99103        %else: 
    100104                <img class="cd" src="${h.page.icon_url(page, size=24)|n}" /> 

  • adhocracy/templates/selection/tiles.html

    r868 r871  
    130130                        <div class="variant_header expand_tab" title="text_${row.text.id}@vs_${selection.id}"> 
    131131                                <div class="variant_innerheader">                                
    132                                 <b><code>${row.text.variant_name}</code></b> 
     132                                <b>${row.text.variant_html|n}</b> 
    133133                                %if row.text.is_head: 
    134134                                        ${_("(this proposal should not change this norm)")} 

  • adhocracy/templates/text/tiles.html

    r867 r871  
    77                            ${diff.page_titles_compare(text, text.parent)|n} 
    88                            %if text.page.has_variants: 
    9                                     (<code>${text.variant_name}</code>) 
     9                                    (${text.variant_html|n}) 
    1010                            %endif 
    1111                        </li> 
    … …  
    116116                                        </div> 
    117117                                %else: 
    118                                         <b><a href="${h.entity_url(this)|n}">${this.variant_name}</a></b> 
     118                                        <b><a href="${h.entity_url(this)|n}">${this.variant_html|n}</a></b> 
    119119                                %endif 
    120120                        %endif 
Note: See TracChangeset for help on using the changeset viewer.