← Back to branch summary

~ubuntu-branches/ubuntu/raring/ginkgocadx/raring-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/main/controllers/controladorinternacionalizacion.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2011-07-14 16:17:51 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110714161751-6wngu3xs307thgpr
Tags: 2.5.1.0-1
http://bugs.debian.org/630877
http://bugs.debian.org/631205
* New upstream version (all patches applied)
  Closes: #630877
* debian/patches/drop_rpath.patch: Fix remaining rpath issue
* debian/{mime,sharedmimeinfo}: Mime info for DICOM images
  Closes: #631205
* Add upstream manpage + desktop file
* Fixed Vcs fields
* debian/rules:
   - Add new extension liblightvisualizator
   - remove get-orig-source target which becames void because
     upstream dropped the debian/ dir
   - Hack around explicite rpath definitions
* debian/install: move conformance.xml into place
* debian/watch: drop useless comments
* debian/ginkgocadx.lintian-overrides: Drop unneeded overrides
  as well as those which stay in effect.  These should vanish
  once rpath is correctly fixed - so the warning should not
  be hidden here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/controllers/controladorinternacionalizacion.cpp
1
1
/*
2
2
 *  
3
 
 *  $Id: controladorinternacionalizacion.cpp 3649 2011-04-04 13:03:14Z tovar $
 
3
 *  $Id: controladorinternacionalizacion.cpp 3893 2011-06-21 13:01:56Z tovar $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
6
 *  Copyright 2008-10 MetaEmotion S.L. All rights reserved.
13
13
 */
14
14
#include "controladorinternacionalizacion.h"
15
15
#include <wx/intl.h>
16
 
#include <wx/confbase.h>
 
16
#include <main/controllers/configurationcontroller.h>
17
17
#include <main/entorno.h>
18
18
 
19
19
 
71
71
                //se lee de la configuracion
72
72
                int ControladorInternacionalizacion::GetIdiomaInterfaz()
73
73
                {
74
 
                        wxConfigBase * config = wxConfigBase::Get();
75
 
                        //se actualiza el fichero de configuracion
76
 
                        config->SetPath(wxT("/GinkgoCore/Station"));
77
74
                        int language;
78
 
                        config->Read(wxT("Language"),&language,-1);
 
75
                        GNC::GCS::ConfigurationController::Instance()->readIntUser("/GinkgoCore/Station", "Language", language,-1);
79
76
                        if (language == -1) 
80
77
                        {
81
78
                                //se pilla el de la maquina