Changeset 1190

Show
Ignore:
Timestamp:
04/03/07 23:56:22 (2 years ago)
Author:
arj..@yirdis.nl
Message:

moved data/ inside gaphor/ package: easier accessible when installed as egg

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gaphor/trunk/NEWS

    r1121 r1190  
     10.10.0 
     2------ 
     3 - New undo management system 
     4 - Setuptools is used for installation and also within Gaphor 
     5 - Depends on zope.component 3.4 and gaphas 0.1.3 (installed on as-needed basis) 
     6 - Installable as Python Egg 
     7 
    180.9.0 
    29----- 

  • gaphor/trunk/TODO

    r1177 r1190  
    55 === zope.component-3.4dev_r72749-py2.4.egg === 
    66 - bug in zope.component package: in zope.component.globalregistry.py zope.testing is included.  This package is only a dependency for the [test] setting. zope.testing is not mandatory. 
    7  
    8  
    9  - Undo functionality 
    10  
    11  - use easysetup tools, move gaphas to a separate package and use 
    12    zope.interface in stead of our included zope tree. 
    13    current implementation in esetup.py. 
    14    open issues: 
    15     - can't build a proper egg (where to put images) 
    16     - how should plugins be handles? Added to code base and initiated through 
    17       pkg_resources (egg_info) 
    18     - installing locales 
    19     - sdist target includes too much files (strip MANIFEST.in?) 
    20     - remove zope/ folders 
    21     - remove gaphas xref. upload a development snapshot 
     7 Use a more recent version 
    228 
    239 - Load / save regression testing 

  • gaphor/trunk/gaphor/__init__.py

    r1188 r1190  
    66__all__ = [ 'main', 'resource', 'GaphorError' ] 
    77 
    8 # Check for GTK-2.0, since we need it anyway... 
    9 #import pygtk 
    10 #pygtk.require('2.0') 
    11 #del pygtk 
     8import os 
    129 
    1310import misc.logger 
    1411 
    15 import version 
     12import pkg_resources 
    1613 
    1714from misc.resource import Resource 
     15 
     16if os.name == 'nt': 
     17    home = 'USERPROFILE' 
     18else: 
     19    home = 'HOME' 
     20 
     21user_data_dir = os.path.join(os.getenv(home), '.gaphor') 
     22 
    1823 
    1924# Application wide resources can be stored in the 'resource' like this 
    …… 
    2530resource = Resource(initial_resources={ 
    2631                        'Name': 'gaphor', 
    27                         'Version': version.VERSION, 
    28                         'DataDir': version.DATA_DIR, 
    29                         'UserDataDir': version.USER_DATA_DIR, 
     32                        'Version': pkg_resources.get_distribution('gaphor').version, 
     33                        'DataDir': os.path.join(pkg_resources.get_distribution('gaphor').location, 'gaphor', 'data'), 
     34                        'UserDataDir': user_data_dir, 
    3035                        'ui.toolbox.classes': True, 
    3136                    }) 

  • gaphor/trunk/gaphor/actions/mainactions.py

    r1170 r1190  
    419419        add_label('<span weight="bold">version %s</span>' % version) 
    420420        add_label('<span variant="smallcaps">UML Modeling tool for GNOME</span>', 8, 8) 
    421         add_label('<span size="small">Copyright (c) 2001-2006 Arjan J. Molenaar</span>', 8, 8) 
     421        add_label('<span size="small">Copyright (c) 2001-2007 Arjan J. Molenaar</span>', 8, 8) 
    422422        #vbox.pack_start(gtk.HSeparator()) 
    423423        notebook.append_page(tab_vbox, gtk.Label('About')) 

  • gaphor/trunk/gaphor/i18n.py

    r384 r1190  
    11# vim:sw=4:et 
    2 """Internationalization (i18n) support for Gaphor. 
     2""" 
     3Internationalization (i18n) support for Gaphor. 
    34 
    45Here the _() function is defined that is used to translate text into 
    …… 
    67""" 
    78 
    8 # default locale dir = sys.prefix/share/locale/<lang>/LC_MESSAGES/gaphor.mo 
    9  
    109__all__ = [ '_' ] 
    1110 
     11import os 
     12 
    1213import gettext 
     14import pkg_resources 
     15 
     16# default locale dir = site-base/gaphor/data/locale/<lang>/LC_MESSAGES/gaphor.mo 
     17localedir = os.path.join(pkg_resources.get_distribution('gaphor').location, \ 
     18                         'gaphor', 'data', 'locale') 
    1319 
    1420try: 
    15     catalog = gettext.Catalog('gaphor') 
     21    catalog = gettext.Catalog('gaphor', localedir=localedir) 
    1622    #log.info('catalog = %s' % catalog.info()) 
    1723    _ = catalog.gettext 

  • gaphor/trunk/po/ca.po

    r1121 r1190  
    66msgstr "" 
    77"Project-Id-Version: Gaphor 0.8.0\n" 
    8 "POT-Creation-Date: Thu Sep 14 09:55:12 2006\n" 
     8"POT-Creation-Date: Wed Apr  4 07:15:29 2007\n" 
    99"PO-Revision-Date: 2006-02-13 16:11+0100\n" 
    1010"Last-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\n" 
    …… 
    2727"Els darrers canvis no es desaran. Voleu continuar?" 
    2828 
     29#: gaphor/actions/mainactions.py:94 
     30msgid "New model" 
     31msgstr "" 
     32 
    2933#: gaphor/actions/mainactions.py:101 
    3034msgid "Created a new model" 
    …… 
    103107msgstr "" 
    104108 
    105 #: gaphor/actions/mainactions.py:615 
     109#: gaphor/actions/mainactions.py:616 
    106110#, fuzzy 
    107111msgid "_Undo" 
    108112msgstr "_Finestra" 
    109113 
    110 #: gaphor/diagram/classifier.py:217 
     114#: gaphor/diagram/classifier.py:248 
    111115msgid "(from %s)" 
    112116msgstr "(des de %s)" 
    …… 
    128132"(S'haurà d'haver engegat Gaphor des de la línia de comandes)" 
    129133 
    130 #: gaphor/plugin.py:88 
     134#: gaphor/plugin.py:90 
    131135msgid "" 
    132136"The file %s already exists. Do you want to replace it with the file you are " 
    …… 
    134138msgstr "" 
    135139 
    136 #: gaphor/storage.py:160 
     140#: gaphor/storage.py:164 
    137141msgid "Loading %d elements..." 
    138142msgstr "Carregant %d elements..." 
    …… 
    142146msgstr "" 
    143147 
    144 #: gaphor/ui/mainwindow.py:32 
     148#: gaphor/ui/mainwindow.py:33 
    145149msgid "Classes" 
    146150msgstr "Classes" 
    147151 
    148 #: gaphor/ui/mainwindow.py:40 
     152#: gaphor/ui/mainwindow.py:41 
    149153msgid "Components" 
    150154msgstr "Components" 
    151155 
    152 #: gaphor/ui/mainwindow.py:47 
     156#: gaphor/ui/mainwindow.py:48 
    153157msgid "Actions" 
    154158msgstr "Accions" 
    155159 
    156 #: gaphor/ui/mainwindow.py:56 
    157 msgid "Interactions" 
    158 msgstr "Interaccions" 
    159  
    160 #: gaphor/ui/mainwindow.py:60 
     160#: gaphor/ui/mainwindow.py:61 
    161161msgid "Use Cases" 
    162162msgstr "Casos d'Ús" 
    163163 
    164 #: gaphor/ui/mainwindow.py:66 
     164#: gaphor/ui/mainwindow.py:67 
    165165msgid "Profiles" 
    166166msgstr "Perfils" 
    167167 
    168 #: gaphor/ui/mainwindow.py:73 
     168#: gaphor/ui/mainwindow.py:74 
    169169msgid "_File" 
    170170msgstr "_Fitxer" 
    171171 
    172 #: gaphor/ui/mainwindow.py:77 
     172#: gaphor/ui/mainwindow.py:78 
    173173msgid "Recent files" 
    174174msgstr "Fitxers recents" 
    175175 
    176 #: gaphor/ui/mainwindow.py:84 
     176#: gaphor/ui/mainwindow.py:85 
    177177msgid "_Import" 
    178178msgstr "_Importa" 
    179179 
    180 #: gaphor/ui/mainwindow.py:86 
     180#: gaphor/ui/mainwindow.py:87 
    181181msgid "_Export" 
    182182msgstr "_Exporta" 
    183183 
    184 #: gaphor/ui/mainwindow.py:93 
     184#: gaphor/ui/mainwindow.py:94 
    185185msgid "_Edit" 
    186186msgstr "_Edita" 
    187187 
    188 #: gaphor/ui/mainwindow.py:107 
     188#: gaphor/ui/mainwindow.py:108 
    189189msgid "_Diagram" 
    190190msgstr "_Diagrama" 
    191191 
    192 #: gaphor/ui/mainwindow.py:119 
     192#: gaphor/ui/mainwindow.py:120 
    193193msgid "Tools" 
    194194msgstr "Eines" 
    195195 
    196 #: gaphor/ui/mainwindow.py:123 
     196#: gaphor/ui/mainwindow.py:124 
    197197msgid "_Window" 
    198198msgstr "_Finestra" 
    199199 
    200 #: gaphor/ui/mainwindow.py:127 
     200#: gaphor/ui/mainwindow.py:128 
    201201msgid "_Help" 
    202202msgstr "_Ajuda" 
    203203 
    204 #: gaphor/ui/mainwindow.py:223 
     204#: gaphor/ui/mainwindow.py:224 
    205205msgid "Quit Gaphor?" 
    206206msgstr "" 
     207 
     208#~ msgid "Interactions" 
     209#~ msgstr "Interaccions" 

  • gaphor/trunk/po/es.po

    r1121 r1190  
    77msgstr "" 
    88"Project-Id-Version: Gaphor 0.8.0\n" 
    9 "POT-Creation-Date: Thu Sep 14 09:55:12 2006\n" 
     9"POT-Creation-Date: Wed Apr  4 07:15:29 2007\n" 
    1010"PO-Revision-Date: 2006-02-11 08:02+0100\n" 
    1111"Last-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\n" 
    …… 
    2828"Cualquier modificación no será guardada. ¿Desea continuar?" 
    2929 
     30#: gaphor/actions/mainactions.py:94 
     31msgid "New model" 
     32msgstr "" 
     33 
    3034#: gaphor/actions/mainactions.py:101 
    3135msgid "Created a new model" 
    …… 
    100104msgstr "_Borrar" 
    101105 
    102 #: gaphor/actions/mainactions.py:615 
     106#: gaphor/actions/mainactions.py:616 
    103107msgid "_Undo" 
    104108msgstr "_Deshacer" 
    105109 
    106 #: gaphor/diagram/classifier.py:217 
     110#: gaphor/diagram/classifier.py:248 
    107111msgid "(from %s)" 
    108112msgstr "(desde %s)" 
    …… 
    124128"(Debe iniciar Gaphor desde la linea de comandos)" 
    125129 
    126 #: gaphor/plugin.py:88 
     130#: gaphor/plugin.py:90 
    127131msgid "" 
    128132"The file %s already exists. Do you want to replace it with the file you are " 
    …… 
    130134msgstr "" 
    131135 
    132 #: gaphor/storage.py:160 
     136#: gaphor/storage.py:164 
    133137msgid "Loading %d elements..." 
    134138msgstr "Cargando %d elementos..." 
    …… 
    138142msgstr "" 
    139143 
    140 #: gaphor/ui/mainwindow.py:32 
     144#: gaphor/ui/mainwindow.py:33 
    141145msgid "Classes" 
    142146msgstr "Clases" 
    143147 
    144 #: gaphor/ui/mainwindow.py:40 
     148#: gaphor/ui/mainwindow.py:41 
    145149msgid "Components" 
    146150msgstr "Componentes" 
    147151 
    148 #: gaphor/ui/mainwindow.py:47 
     152#: gaphor/ui/mainwindow.py:48 
    149153msgid "Actions" 
    150154msgstr "Acciones" 
    151155 
    152 #: gaphor/ui/mainwindow.py:56 
    153 msgid "Interactions" 
    154 msgstr "Interacciones" 
    155  
    156 #: gaphor/ui/mainwindow.py:60 
     156#: gaphor/ui/mainwindow.py:61 
    157157msgid "Use Cases" 
    158158msgstr "Casos de Uso" 
    159159 
    160 #: gaphor/ui/mainwindow.py:66 
     160#: gaphor/ui/mainwindow.py:67 
    161161msgid "Profiles" 
    162162msgstr "Perfiles" 
    163163 
    164 #: gaphor/ui/mainwindow.py:73 
     164#: gaphor/ui/mainwindow.py:74 
    165165msgid "_File" 
    166166msgstr "_Archivo" 
    167167 
    168 #: gaphor/ui/mainwindow.py:77 
     168#: gaphor/ui/mainwindow.py:78 
    169169msgid "Recent files" 
    170170msgstr "Archivos recientes" 
    171171 
    172 #: gaphor/ui/mainwindow.py:84 
     172#: gaphor/ui/mainwindow.py:85 
    173173msgid "_Import" 
    174174msgstr "_Importar" 
    175175 
    176 #: gaphor/ui/mainwindow.py:86 
     176#: gaphor/ui/mainwindow.py:87 
    177177msgid "_Export" 
    178178msgstr "_Exportar" 
    179179 
    180 #: gaphor/ui/mainwindow.py:93 
     180#: gaphor/ui/mainwindow.py:94 
    181181msgid "_Edit" 
    182182msgstr "_Editar" 
    183183 
    184 #: gaphor/ui/mainwindow.py:107 
     184#: gaphor/ui/mainwindow.py:108 
    185185msgid "_Diagram" 
    186186msgstr "_Diagrama" 
    187187 
    188 #: gaphor/ui/mainwindow.py:119 
     188#: gaphor/ui/mainwindow.py:120 
    189189msgid "Tools" 
    190190msgstr "Herramientas" 
    191191 
    192 #: gaphor/ui/mainwindow.py:123 
     192#: gaphor/ui/mainwindow.py:124 
    193193msgid "_Window" 
    194194msgstr "_Ventana" 
    195195 
    196 #: gaphor/ui/mainwindow.py:127 
     196#: gaphor/ui/mainwindow.py:128 
    197197msgid "_Help" 
    198198msgstr "_Ayuda" 
    199199 
    200 #: gaphor/ui/mainwindow.py:223 
     200#: gaphor/ui/mainwindow.py:224 
    201201msgid "Quit Gaphor?" 
    202202msgstr "" 
     203 
     204#~ msgid "Interactions" 
     205#~ msgstr "Interacciones" 

  • gaphor/trunk/po/nl.po

    r1121 r1190  
    77msgstr "" 
    88"Project-Id-Version: 0.6.0\n" 
    9 "POT-Creation-Date: Thu Sep 14 09:55:12 2006\n" 
     9"POT-Creation-Date: Wed Apr  4 07:15:29 2007\n" 
    1010"PO-Revision-Date: 2004-06-10 08:00+001\n" 
    1111"Last-Translator: Arjan Molenaar <arjanmol_at_users.sourceforge.net>\n" 
    …… 
    2525"Any changes made will not be saved. Do you want to continue?" 
    2626msgstr "" 
     27"Het openen van een nieuw model zal het huidige model vervangen.\n" 
     28"Veranderingen zullen niet eerst opgeslagen worden. Wilt u doorgaan?" 
     29 
     30#: gaphor/actions/mainactions.py:94 
     31msgid "New model" 
     32msgstr "Nieuw model" 
    2733 
    2834#: gaphor/actions/mainactions.py:101 
    …… 
    3238#: gaphor/actions/mainactions.py:113 
    3339msgid "_Revert..." 
    34 msgstr "" 
     40msgstr "_Herlaad..." 
    3541 
    3642#: gaphor/actions/mainactions.py:135 
    …… 
    4450#: gaphor/actions/mainactions.py:166 
    4551msgid "Could not load model file." 
    46 msgstr "" 
     52msgstr "Kan model bestand niet laden." 
    4753 
    4854#: gaphor/actions/mainactions.py:173 
    4955msgid "_Open..." 
    50 msgstr "" 
     56msgstr "_Open..." 
    5157 
    5258#: gaphor/actions/mainactions.py:210 
    5359msgid "Save the model to a new file" 
    54 msgstr "" 
     60msgstr "Sla het model op in een nieuw bestand" 
    5561 
    5662#: gaphor/actions/mainactions.py:262 
    5763msgid "Save Gaphor model as" 
    58 msgstr "" 
     64msgstr "Sla Gaphor model op als" 
    5965 
    6066#: gaphor/actions/mainactions.py:327 
    …… 
    6571#: gaphor/actions/mainactions.py:346 
    6672msgid "_Console" 
    67 msgstr "" 
     73msgstr "_Console" 
    6874 
    6975#: gaphor/actions/mainactions.py:364 
    7076msgid "_Manual" 
    71 msgstr "" 
     77msgstr "_Handleiding" 
    7278 
    7379#: gaphor/actions/mainactions.py:384 
    7480msgid "_About" 
    75 msgstr "" 
     81msgstr "_Over Gaphor" 
    7682 
    7783#: gaphor/actions/mainactions.py:451 
    7884#, fuzzy 
    7985msgid "_New diagram" 
    80 msgstr "_Diagram" 
     86msgstr "_Nieuw Diagram" 
    8187 
    8288#: gaphor/actions/mainactions.py:477 
    8389#, fuzzy 
    8490msgid "_Delete diagram" 
    85 msgstr "_Diagram" 
     91msgstr "Verwijder _Diagram" 
    8692 
    8793#: gaphor/actions/mainactions.py:506 
    8894msgid "_Open" 
    89 msgstr "" 
     95msgstr "_Open" 
    9096 
    9197#: gaphor/actions/mainactions.py:527 
    9298msgid "_Rename" 
    93 msgstr "" 
     99msgstr "_Hernoem" 
    94100 
    95101#: gaphor/actions/mainactions.py:555 
    96102msgid "_Refresh" 
    97 msgstr "" 
     103msgstr "Ve_rvers" 
    98104 
    99105#: gaphor/actions/mainactions.py:570 
    100106msgid "_Delete" 
    101 msgstr "" 
    102  
    103 #: gaphor/actions/mainactions.py:615 
     107msgstr "Verwij_der" 
     108 
     109#: gaphor/actions/mainactions.py:616 
    104110#, fuzzy 
    105111msgid "_Undo" 
    106 msgstr "_Venster" 
    107  
    108 #: gaphor/diagram/classifier.py:217 
     112msgstr "_Ongedaan maken" 
     113 
     114#: gaphor/diagram/classifier.py:248 
    109115msgid "(from %s)" 
    110116msgstr "(van %s)" 
    …… 
    112118#: gaphor/misc/errorhandler.py:22 
    113119msgid "An error occured." 
    114 msgstr "" 
     120msgstr "Er is een fout opgetreden" 
    115121 
    116122#: gaphor/misc/errorhandler.py:29 
    …… 
    121127"(Gaphor should have been started from the command line)" 
    122128msgstr "" 
    123  
    124 #: gaphor/plugin.py:88 
     129"\n" 
     130"\n" 
     131"Wilt u debuggen?" 
     132"(Gaphor moet gestart zijn vanaf de commando regel)" 
     133 
     134#: gaphor/plugin.py:90 
    125135msgid "" 
    126136"The file %s already exists. Do you want to replace it with the file you are " 
    …… 
    128138msgstr "" 
    129139 
    130 #: gaphor/storage.py:160 
     140#: gaphor/storage.py:164 
    131141msgid "Loading %d elements..." 
    132142msgstr "Laden van %s elementen..." 
    …… 
    134144#: gaphor/ui/diagramtab.py:49 
    135145msgid "<None>" 
    136 msgstr "" 
    137  
    138 #: gaphor/ui/mainwindow.py:32 
     146msgstr "<None>" 
     147 
     148#: gaphor/ui/mainwindow.py:33 
    139149msgid "Classes" 
    140150msgstr "Klassen" 
    141151 
    142 #: gaphor/ui/mainwindow.py:40 
     152#: gaphor/ui/mainwindow.py:41 
    143153msgid "Components" 
    144154msgstr "Componenten" 
    145155 
    146 #: gaphor/ui/mainwindow.py:47 
     156#: gaphor/ui/mainwindow.py:48 
    147157msgid "Actions" 
    148 msgstr "Akties" 
    149  
    150 #: gaphor/ui/mainwindow.py:56 
    151 #, fuzzy 
    152 msgid "Interactions" 
    153 msgstr "Akties" 
    154  
    155 #: gaphor/ui/mainwindow.py:60 
     158msgstr "Acties" 
     159 
     160#: gaphor/ui/mainwindow.py:61 
    156161msgid "Use Cases" 
    157162msgstr "Use cases" 
    158163 
    159 #: gaphor/ui/mainwindow.py:66 
     164#: gaphor/ui/mainwindow.py:67 
    160165msgid "Profiles" 
    161 msgstr "Profilen" 
    162  
    163 #: gaphor/ui/mainwindow.py:73 
     166msgstr "Profielen" 
     167 
     168#: gaphor/ui/mainwindow.py:74 
    164169msgid "_File" 
    165170msgstr "_Bestand" 
    166171 
    167 #: gaphor/ui/mainwindow.py:77 
     172#: gaphor/ui/mainwindow.py:78 
    168173msgid "Recent files" 
    169174msgstr "Recente bestanden" 
    170175 
    171 #: gaphor/ui/mainwindow.py:84 
     176#: gaphor/ui/mainwindow.py:85 
    172177#, fuzzy 
    173178msgid "_Import" 
    174179msgstr "_Exporteer" 
    175180 
    176 #: gaphor/ui/mainwindow.py:86 
     181#: gaphor/ui/mainwindow.py:87 
    177182msgid "_Export" 
    178183msgstr "_Exporteer" 
    179184 
    180 #: gaphor/ui/mainwindow.py:93 
     185#: gaphor/ui/mainwindow.py:94 
    181186msgid "_Edit" 
    182187msgstr "_Wijzig" 
    183188 
    184 #: gaphor/ui/mainwindow.py:107 
     189#: gaphor/ui/mainwindow.py:108 
    185190msgid "_Diagram" 
    186191msgstr "_Diagram" 
    187192 
    188 #: gaphor/ui/mainwindow.py:119 
     193#: gaphor/ui/mainwindow.py:120 
    189194msgid "Tools" 
    190 msgstr "" 
    191  
    192 #: gaphor/ui/mainwindow.py:123 
     195msgstr "Hulpmiddelen" 
     196 
     197#: gaphor/ui/mainwindow.py:124 
    193198msgid "_Window" 
    194199msgstr "_Venster" 
    195200 
    196 #: gaphor/ui/mainwindow.py:127 
     201#: gaphor/ui/mainwindow.py:128 
    197202msgid "_Help" 
    198203msgstr "_Help" 
    199204 
    200 #: gaphor/ui/mainwindow.py:223 
     205#: gaphor/ui/mainwindow.py:224 
    201206msgid "Quit Gaphor?" 
    202 msgstr "" 
     207msgstr "Beeindig Gaphor?" 
     208 
     209#, fuzzy 
     210#~ msgid "Interactions" 
     211#~ msgstr "Interacties" 
    203212 
    204213#~ msgid "To be implemented" 

  • gaphor/trunk/po/sv.po

    r1121 r1190  
    77msgstr "" 
    88"Project-Id-Version: gaphor\n" 
    9 "POT-Creation-Date: Thu Sep 14 09:55:12 2006\n" 
     9"POT-Creation-Date: Wed Apr  4 07:15:29 2007\n" 
    1010"PO-Revision-Date: 2006-05-11 16:34+0100\n" 
    1111"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" 
    …… 
    2929"Vill du fortsÀtta?" 
    3030 
     31#: gaphor/actions/mainactions.py:94 
     32msgid "New model" 
     33msgstr "" 
     34 
    3135#: gaphor/actions/mainactions.py:101 
    3236msgid "Created a new model" 
    …… 
    101105msgstr "_Ta bort" 
    102106 
    103 #: gaphor/actions/mainactions.py:615 
     107#: gaphor/actions/mainactions.py:616 
    104108msgid "_Undo" 
    105109msgstr "_à
    106110ngra" 
    107111 
    108 #: gaphor/diagram/classifier.py:217 
     112#: gaphor/diagram/classifier.py:248 
    109113msgid "(from %s)" 
    110114msgstr "(frÃ¥n %s)" 
    …… 
    126130"(Gaphor bör ha startats frÃ¥n kommandoraden)" 
    127131 
    128 #: gaphor/plugin.py:88 
     132#: gaphor/plugin.py:90 
    129133msgid "" 
    130134"The file %s already exists. Do you want to replace it with the file you are " 
    …… 
    132136msgstr "" 
    133137 
    134 #: gaphor/storage.py:160 
     138#: gaphor/storage.py:164 
    135139msgid "Loading %d elements..." 
    136140msgstr "LÀser in %d element..." 
    …… 
    140144msgstr "" 
    141145 
    142 #: gaphor/ui/mainwindow.py:32 
     146#: gaphor/ui/mainwindow.py:33 
    143147msgid "Classes" 
    144148msgstr "Klasser" 
    145149 
    146 #: gaphor/ui/mainwindow.py:40 
     150#: gaphor/ui/mainwindow.py:41 
    147151msgid "Components" 
    148152msgstr "Komponenter" 
    149153 
    150 #: gaphor/ui/mainwindow.py:47 
     154#: gaphor/ui/mainwindow.py:48 
    151155msgid "Actions" 
    152156msgstr "à
    153157tgÀrder" 
    154158 
    155 #: gaphor/ui/mainwindow.py:56 
    156 msgid "Interactions" 
    157 msgstr "Interaktioner" 
    158  
    159159# OsÀker pÃ¥ denna 
    160 #: gaphor/ui/mainwindow.py:60 
     160#: gaphor/ui/mainwindow.py:61 
    161161msgid "Use Cases" 
    162162msgstr "AnvÀnd lÃ¥dor" 
    163163 
    164 #: gaphor/ui/mainwindow.py:66 
     164#: gaphor/ui/mainwindow.py:67 
    165165msgid "Profiles" 
    166166msgstr "Profiler" 
    167167 
    168 #: gaphor/ui/mainwindow.py:73 
     168#: gaphor/ui/mainwindow.py:74 
    169169msgid "_File" 
    170170msgstr "_Arkiv" 
    171171 
    172 #: gaphor/ui/mainwindow.py:77 
     172#: gaphor/ui/mainwindow.py:78 
    173173msgid "Recent files" 
    174174msgstr "Tidigare filer" 
    175175 
    176 #: gaphor/ui/mainwindow.py:84 
     176#: gaphor/ui/mainwindow.py:85 
    177177msgid "_Import" 
    178178msgstr "_Importera" 
    179179 
    180 #: gaphor/ui/mainwindow.py:86 
     180#: gaphor/ui/mainwindow.py:87 
    181181msgid "_Export" 
    182182msgstr "_Exportera" 
    183183 
    184 #: gaphor/ui/mainwindow.py:93 
     184#: gaphor/ui/mainwindow.py:94 
    185185msgid "_Edit" 
    186186msgstr "R_edigera" 
    187187 
    188 #: gaphor/ui/mainwindow.py:107 
     188#: gaphor/ui/mainwindow.py:108 
    189189msgid "_Diagram" 
    190190msgstr "_Diagram" 
    191191 
    192 #: gaphor/ui/mainwindow.py:119 
     192#: gaphor/ui/mainwindow.py:120 
    193193msgid "Tools" 
    194194msgstr "Verktyg" 
    195195 
    196 #: gaphor/ui/mainwindow.py:123 
     196#: gaphor/ui/mainwindow.py:124 
    197197msgid "_Window" 
    198198msgstr "_Fönster" 
    199199 
    200 #: gaphor/ui/mainwindow.py:127 
     200#: gaphor/ui/mainwindow.py:128 
    201201msgid "_Help" 
    202202msgstr "_HjÀlp" 
    203203 
    204 #: gaphor/ui/mainwindow.py:223 
     204#: gaphor/ui/mainwindow.py:224 
    205205msgid "Quit Gaphor?" 
    206206msgstr "" 
     207 
     208#~ msgid "Interactions" 
     209#~ msgstr "Interaktioner" 
    207210 
    208211#~ msgid "To be implemented" 

  • gaphor/trunk/setup.cfg

    r1176 r1190  
    22[egg_info] 
    33# Point egg_base to compiled sources, cause some sources have to be generated 
    4 egg_base=build/lib 
     4#egg_base=build/lib 
    55 
    6 [install] 
    7 install_data=$base/share/gaphor 

  • gaphor/trunk/setup.py

    r1189 r1190  
    2121from utils.command.build_mo import build_mo 
    2222from utils.command.build_pot import build_pot 
    23 from utils.command.install_mo import install_mo 
    2423from utils.command.build_uml import build_uml 
    25 from utils.command.build_version import build_version 
    26 from utils.command.install_version import install_version 
    2724from utils.command.run import run 
    2825 
    2926LINGUAS = [ 'ca', 'es', 'nl', 'sv' ] 
    3027 
    31 from glob import glob 
    32 def plugin_data(name): 
    33     return 'plugins/%s' % name, glob('data/plugins/%s/*.*' % name) 
    3428 
    3529setup( 
    3630    name='gaphor', 
    3731    version=VERSION, 
    38     url='http://gaphor.sourceforge.net', 
     32    url='http://gaphor.devjavu.com', 
    3933    author='Arjan J. Molenaar', 
    4034    author_email='arjanmol@users.sourceforge.net', 
    …… 
    5953    ], 
    6054 
    61     keywords = 'model modeling modelling uml diagram python', 
     55    keywords = 'model modeling modelling uml diagram python tool', 
    6256 
    63     packages = find_packages(exclude=['ez_setup', 'gaphas', 'utils*', 'zope_old*']), 
     57    packages = find_packages(exclude=['ez_setup', 'utils*']), 
    6458 
    65     package_data = { 
    66         'data': [ 'icons.xml' ], 
    67         'data/pixmaps': [ '*.png' ], 
    68         'data/plugins': [ '*/plugin.xml', '*/*.txt', '*/*.py' ] 
    69     }, 
    70     data_files=[('', ['data/icons.xml']), 
    71                 ('pixmaps', glob('data/pixmaps/*.png')), 
    72                 plugin_data('plugineditor'), 
    73                 plugin_data('alignment'), 
    74                 plugin_data('checkmetamodel'), 
    75                 plugin_data('diagramlayout'), 
    76                 plugin_data('liveobjectbrowser'), 
    77                 plugin_data('pngexport'), 
    78                 plugin_data('pynsource'), 
    79                 plugin_data('svgexport'), 
    80                 plugin_data('pdfexport'), 
    81                 plugin_data('xmiexport') 
    82     ], 
     59    include_package_data = True, 
    8360 
    8461    install_requires = [ 
    …… 
    10582    cmdclass = { 
    10683              'build_uml': build_uml, 
    107               'build_version': build_version, 
    108               'install_version': install_version, 
    10984              'build_mo': build_mo, 
    11085              'build_pot': build_pot, 

  • gaphor/trunk/utils/command/build_mo.py

    r1142 r1190  
    3535        if self.build_dir is None: 
    3636            self.set_undefined_options('build', 
    37                                        ('build_base', 'build_dir')) 
    38             self.build_dir = os.path.join(self.build_dir, 'locale') 
     37                                       ('build_lib', 'build_dir')) 
     38            self.build_dir = os.path.join(self.build_dir, 'gaphor', 'data', 'locale') 
    3939 
    4040        self.all_linguas = self.all_linguas.split(',') 
    …… 
    4545            return 
    4646 
    47         self.mkpath(self.build_dir) 
    4847        for lingua in self.all_linguas: 
    4948            pofile = os.path.join('po', lingua + '.po') 
    50             outfile = os.path.join(self.build_dir, lingua + '.mo') 
     49            outdir = os.path.join(self.build_dir, lingua, 'LC_MESSAGES') 
     50            self.mkpath(outdir) 
     51            outfile = os.path.join(outdir, 'gaphor.mo') 
    5152            if self.force or newer(pofile, outfile): 
    5253                print 'converting %s -> %s' % (pofile, outfile)