diff --git a/sources/qetinformation.cpp b/sources/qetinformation.cpp index 2e16db3cd..aa5c199c8 100644 --- a/sources/qetinformation.cpp +++ b/sources/qetinformation.cpp @@ -46,6 +46,7 @@ QStringList QETInformation::titleblockInfoKeys() info_list << "projectfilename"; info_list << "saveddate"; info_list << "saveddate-eu"; + info_list << "saveddate-us"; info_list << "savedtime"; info_list << "savedfilename"; info_list << "savedfilepath"; @@ -77,8 +78,9 @@ QString QETInformation::titleblockTranslatedInfoKey(const QString &info) else if (info == "projecttitle") return QObject::tr("Titre du projet"); else if (info == "projectpath") return QObject::tr("Chemin du fichier du projet"); else if (info == "projectfilename") return QObject::tr("Nom du fichier"); - else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier format yyyy-MM-dd"); + else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier format local"); else if (info == "saveddate-eu") return QObject::tr("Date d'enregistrement du fichier format dd-MM-yyyy"); + else if (info == "saveddate-us") return QObject::tr("Date d'enregistrement du fichier format yyyy-MM-dd"); else if (info == "savedtime") return QObject::tr("Heure d'enregistrement du fichier"); else if (info == "savedfilename") return QObject::tr("Nom du fichier enregistré"); else if (info == "savedfilepath") return QObject::tr("Chemin du fichier enregistré"); @@ -111,6 +113,7 @@ QString QETInformation::titleblockInfoKeysToVar(const QString &info) else if (info == "projectfilename") return QString("%{projectfilename}"); else if (info == "saveddate") return QString("%{saveddate}"); else if (info == "saveddate-eu") return QString("%{saveddate-eu}"); + else if (info == "saveddate-us") return QString("%{saveddate-us}"); else if (info == "savedtime") return QString("%{savedtime}"); else if (info == "savedfilename") return QString("%{savedfilename}"); else if (info == "savedfilepath") return QString("%{savedfilepath}"); diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 493733d19..4e8238d3e 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -33,7 +33,6 @@ #include "assignvariables.h" #include -#include #include #include #include @@ -291,9 +290,10 @@ void QETProject::setFilePath(const QString &filepath) } //title block variables should be updated after file save as dialog is confirmed, before file is saved. - m_project_properties.addValue("saveddate", QDate::currentDate().toString("yyyy-MM-dd")); - m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy")); - m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); + m_project_properties.addValue("saveddate", QLocale::system().toString(QDate::currentDate(), QLocale::ShortFormat)); + m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy")); + m_project_properties.addValue("saveddate-us", QDate::currentDate().toString("yyyy-MM-dd")); + m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName()); m_project_properties.addValue("savedfilepath", filePath()); @@ -925,12 +925,12 @@ bool QETProject::close() */ QETResult QETProject::write() { - // this operation requires a filepath + // this operation requires a filepath if (m_file_path.isEmpty()) return(QString("unable to save project to file: no filepath was specified")); - // if the project was opened read-only - // and the file is still non-writable, do not save the project + // if the project was opened read-only + // and the file is still non-writable, do not save the project if (isReadOnly() && !QFileInfo(m_file_path).isWritable()) return(QString("the file %1 was opened read-only and thus will not be written").arg(m_file_path)); @@ -939,14 +939,11 @@ QETResult QETProject::write() if (!QET::writeXmlFile(xml_project, m_file_path, &error_message)) return(error_message); - //title block variables should be updated after file save dialog is confirmed, before file is saved. - m_project_properties.addValue( - "saveddate", - QDate::currentDate().toString("yyyy-MM-dd")); - m_project_properties.addValue( - "saveddate-eu", - QDate::currentDate().toString("dd-MM-yyyy")); - m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); + //title block variables should be updated after file save dialog is confirmed, before file is saved. + m_project_properties.addValue("saveddate", QLocale::system().toString(QDate::currentDate(), QLocale::ShortFormat)); + m_project_properties.addValue("saveddate-us", QDate::currentDate().toString("yyyy-MM-dd")); + m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy")); + m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName()); m_project_properties.addValue("savedfilepath", filePath()); diff --git a/sources/titleblock/templatecellwidget.cpp b/sources/titleblock/templatecellwidget.cpp index adbda0d57..d6410fb6a 100644 --- a/sources/titleblock/templatecellwidget.cpp +++ b/sources/titleblock/templatecellwidget.cpp @@ -460,8 +460,9 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const "
  • %{projecttitle} : titre du projet
  • " "
  • %{projectpath} : chemin du projet
  • " "
  • %{projectfilename} : nom du fichier
  • " - "
  • %{saveddate} : date d'enregistrement du fichier format yyyy-MM-dd
  • " + "
  • %{saveddate} : date d'enregistrement du fichier format local
  • " "
  • %{saveddate-eu} : date d'enregistrement du fichier format dd-MM-yyyy
  • " + "
  • %{saveddate-us} : date d'enregistrement du fichier format yyyy-MM-dd
  • " "
  • %{savedtime} : heure d'enregistrement du fichier
  • " "
  • %{savedfilename} : nom du fichier enregistré
  • " "
  • %{savedfilepath} : chemin du fichier enregistré
  • "