fixed some working issue on english

src/adaptors/UBMetadataDcSubsetAdaptor.cpp

@@ -112,10 +112,10 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy)
     // introduced in OpenSankore 1.40.00
     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTitle,proxy->metaData(UBSettings::sessionTitle).toString());
     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionAuthors,proxy->metaData(UBSettings::sessionAuthors).toString());
-    xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionGoals,proxy->metaData(UBSettings::sessionGoals).toString());
+    xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionObjectives,proxy->metaData(UBSettings::sessionObjectives).toString());
     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionKeywords,proxy->metaData(UBSettings::sessionKeywords).toString());
     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionGradeLevel,proxy->metaData(UBSettings::sessionGradeLevel).toString());
-    xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionBranch,proxy->metaData(UBSettings::sessionBranch).toString());
+    xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionSubjects,proxy->metaData(UBSettings::sessionSubjects).toString());
     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionType,proxy->metaData(UBSettings::sessionType).toString());
     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionLicence,proxy->metaData(UBSettings::sessionLicence).toString());
 
@@ -228,10 +228,10 @@ QMap<QString, QVariant> UBMetadataDcSubsetAdaptor::load(QString pPath)
                 {
                     metadata.insert(UBSettings::sessionAuthors, xml.readElementText());
                 }
-                else if (xml.name() == UBSettings::sessionGoals // introduced in OpenSankore 1.40.00
+                else if (xml.name() == UBSettings::sessionObjectives // introduced in OpenSankore 1.40.00
                          && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)
                 {
-                    metadata.insert(UBSettings::sessionGoals, xml.readElementText());
+                    metadata.insert(UBSettings::sessionObjectives, xml.readElementText());
                 }
                 else if (xml.name() == UBSettings::sessionKeywords // introduced in OpenSankore 1.40.00
                          && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)
@@ -243,10 +243,10 @@ QMap<QString, QVariant> UBMetadataDcSubsetAdaptor::load(QString pPath)
                 {
                     metadata.insert(UBSettings::sessionGradeLevel, xml.readElementText());
                 }
-                else if (xml.name() == UBSettings::sessionBranch // introduced in OpenSankore 1.40.00
+                else if (xml.name() == UBSettings::sessionSubjects // introduced in OpenSankore 1.40.00
                          && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)
                 {
-                    metadata.insert(UBSettings::sessionBranch, xml.readElementText());
+                    metadata.insert(UBSettings::sessionSubjects, xml.readElementText());
                 }
                 else if (xml.name() == UBSettings::sessionType // introduced in OpenSankore 1.40.00
                          && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri)

src/core/UBSettings.cpp

@@ -38,10 +38,10 @@ QString UBSettings::documentVersion = QString("Version");
 QString UBSettings::documentUpdatedAt = QString("UpdatedAt");
 QString UBSettings::sessionTitle = QString("sessionTitle");
 QString UBSettings::sessionAuthors = QString("sessionAuthors");
-QString UBSettings::sessionGoals = QString("sessionGoals");
+QString UBSettings::sessionObjectives = QString("sessionObjectives");
 QString UBSettings::sessionKeywords = QString("sessionKeywords");
 QString UBSettings::sessionGradeLevel = QString("sessionGradeLevel");
-QString UBSettings::sessionBranch = QString("sessionBranch");
+QString UBSettings::sessionSubjects = QString("sessionSubjects");
 QString UBSettings::sessionType = QString("sessionType");
 QString UBSettings::sessionLicence = QString("sessionLicence");
 QString UBSettings::documentDate = QString("date");
@@ -55,7 +55,7 @@ QString UBSettings::uniboardApplicationNamespaceUri = "http://uniboard.mnemis.co
 const int UBSettings::sDefaultFontPixelSize = 36;
 const char *UBSettings::sDefaultFontFamily = "Arial";
 
-QString UBSettings::currentFileVersion = "4.5.0";
+QString UBSettings::currentFileVersion = "4.6.0";
 
 QColor UBSettings::crossDarkBackground = QColor(44, 44, 44, 200);
 QColor UBSettings::crossLightBackground = QColor(165, 225, 255);

src/core/UBSettings.h

@@ -156,10 +156,10 @@ class UBSettings : public QObject
 
         static QString sessionTitle;
         static QString sessionAuthors;
-        static QString sessionGoals;
+        static QString sessionObjectives;
         static QString sessionKeywords;
         static QString sessionGradeLevel;
-        static QString sessionBranch;
+        static QString sessionSubjects;
         static QString sessionType;
         static QString sessionLicence;
 

src/document/UBDocumentProxy.cpp

@@ -53,10 +53,10 @@ void UBDocumentProxy::init()
     //teacherGuide metadata
     setMetaData(UBSettings::sessionTitle,"");
     setMetaData(UBSettings::sessionAuthors,"");
-    setMetaData(UBSettings::sessionGoals,"");
+    setMetaData(UBSettings::sessionObjectives,"");
     setMetaData(UBSettings::sessionKeywords,"");
     setMetaData(UBSettings::sessionGradeLevel,"");
-    setMetaData(UBSettings::sessionBranch,"");
+    setMetaData(UBSettings::sessionSubjects,"");
     setMetaData(UBSettings::sessionType,"");
     setMetaData(UBSettings::sessionLicence,"");
 }

src/gui/UBTeacherGuideWidget.h

@@ -150,9 +150,9 @@ private:
 
     QLabel* mpCreationLabel;
     QLabel* mpLastModifiedLabel;
-    QLabel* mpGoalsLabel;
-    UBTGAdaptableText* mpGoals;
-    QFrame* mpSeparatorGoals;
+    QLabel* mpObjectivesLabel;
+    UBTGAdaptableText* mpObjectives;
+    QFrame* mpSeparatorObjectives;
 
     QLabel* mpIndexLabel;
     QLabel* mpKeywordsLabel;
@@ -162,9 +162,9 @@ private:
     QComboBox* mpSchoolLevelBox;
     QLabel* mpSchoolLevelValueLabel;
 
-    QLabel* mpSchoolBranchItemLabel;
-    QComboBox* mpSchoolBranchBox;
-    QLabel* mpSchoolBranchValueLabel;
+    QLabel* mpSchoolSubjectsItemLabel;
+    QComboBox* mpSchoolSubjectsBox;
+    QLabel* mpSchoolSubjectsValueLabel;
 
     QLabel* mpSchoolTypeItemLabel;
     QComboBox* mpSchoolTypeBox;