MRG

CMake/GenerateConfigProperties.cpp

@@ -57,11 +57,11 @@ int main(int argc, char* argv[])
    }
    
    /** Get local configuration*/
-   const std::locale& mylocale = std::locale("");
-   std::string language = mylocale.name();
+//    const std::locale& mylocale = std::locale("");
+//    std::string language = mylocale.name();
    
-   if (language == "C")
-     language = "en_EN.UTF-8";
+//    if (language == "C")
+   std::string language = "en_EN.UTF-8";
    
    /** Write parameters to the configuration file*/
    os << "#Auto generated by config-properties \n"

Code/Common/otbI18n.h

@@ -35,7 +35,7 @@
   typedef otb::ConfigurationFile        ConfigurationType;\
   ConfigurationType::Pointer conf = ConfigurationType::GetInstance();\
   std::string lang = conf->GetParameter<std::string>("OTB_LANG");\
-  setlocale( LC_ALL, lang.c_str() );\
+  setlocale( LC_MESSAGES, lang.c_str() );\
   bindtextdomain( "otb", QUOTEME(OTB_LANG_LOCATION) );\
   textdomain( "otb" );\
   std::cout << "Language: " << lang << std::endl;\

Examples/Tutorials/BasicApplication/Common/otbMsgReporterGUI.fl

 # data file for the Fltk User Interface Designer (fluid)
-version 1.0110 
+version 1.0107 
 i18n_type 1 
 i18n_include "otbI18n.h" 
 i18n_function otbGetTextMacro 

Examples/Tutorials/BasicApplication/View/otbBasicApplicationViewGUI.fl

 # data file for the Fltk User Interface Designer (fluid)
-version 1.0110 
+version 1.0107 
 i18n_type 1 
 i18n_include "otbI18n.h" 
 i18n_function otbGetTextMacro 

Examples/Tutorials/CMakeLists.txt

@@ -23,7 +23,12 @@ IF(OTB_USE_VISU_GUI)
   ADD_EXECUTABLE(SimpleViewer SimpleViewer.cxx )
   TARGET_LINK_LIBRARIES(SimpleViewer OTBCommon OTBIO OTBGui OTBVisualization ${OTB_VISU_GUI_LIBRARIES})
 
-  SUBDIRS(BasicApplication)
+# The basic application tutorial makes use of the otbApplicationsCommon library which is built in OTB-Applications package.
+# Therefore this tutorial will not compile until we move the OTBApplcationsCommon lib to the OTB. Until then, 
+# the following line will be commented out.
+# SUBDIRS(BasicApplication)
+
+
 ENDIF(OTB_USE_VISU_GUI)
 
 ADD_EXECUTABLE(OrthoFusion OrthoFusion.cxx )