diff --git a/autotests/formattest.cpp b/autotests/formattest.cpp index 525f24abd..4875d23d7 100644 --- a/autotests/formattest.cpp +++ b/autotests/formattest.cpp @@ -1,220 +1,224 @@ /*************************************************************************** * Copyright (C) 2019 by João Netto * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ #include #include #include #include #include "../settings_core.h" #include #include #include #include #include "../generators/poppler/config-okular-poppler.h" class FormatTest: public QObject { Q_OBJECT private slots: void initTestCase(); void cleanupTestCase(); void testTimeFormat(); void testSpecialFormat(); private: Okular::Document *m_document; QMap m_fields; QString m_formattedText; }; void FormatTest::initTestCase() { Okular::SettingsCore::instance( QStringLiteral( "formattest" ) ); m_document = new Okular::Document( nullptr ); + // Force consistent locale + QLocale locale( QStringLiteral( "en_US" ) ); + QLocale::setDefault( locale ); + const QString testFile = QStringLiteral( KDESRCDIR "data/formattest.pdf" ); QMimeDatabase db; const QMimeType mime = db.mimeTypeForFile( testFile ); QCOMPARE( m_document->openDocument( testFile, QUrl(), mime), Okular::Document::OpenSuccess ); connect( m_document, &Okular::Document::refreshFormWidget, [=]( Okular::FormField * form ) { Okular::FormFieldText *fft = reinterpret_cast< Okular::FormFieldText * >( form ); if( fft ) m_formattedText = fft->text(); }); const Okular::Page* page = m_document->page( 0 ); for ( Okular::FormField *ff: page->formFields() ) { m_fields.insert( ff->name(), ff ); } } void FormatTest::testTimeFormat() { Okular::FormFieldText *fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time1" ) ] ); fft->setText( QStringLiteral( "1:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "01:20" ), m_formattedText ); fft->setText( QStringLiteral( "1:20 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "13:20" ), m_formattedText ); fft->setText( QStringLiteral( "1" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "" ), m_formattedText ); fft->setText( QStringLiteral( "25:12" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "" ), m_formattedText ); fft->setText( QStringLiteral( "abcd" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "" ), m_formattedText ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time2" ) ] ); fft->setText( QStringLiteral( "1:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "1:20 am" ), m_formattedText ); fft->setText( QStringLiteral( "01:20 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "1:20 pm" ), m_formattedText ); fft->setText( QStringLiteral( "13:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "1:20 pm" ), m_formattedText ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time3" ) ] ); fft->setText( QStringLiteral( "1:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "01:20:00" ), m_formattedText ); fft->setText( QStringLiteral( "1:20:00 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "13:20:00" ), m_formattedText ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time4" ) ] ); fft->setText( QStringLiteral( "1:20:00" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "1:20:00 am" ), m_formattedText ); fft->setText( QStringLiteral( "01:20:00 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "1:20:00 pm" ), m_formattedText ); fft->setText( QStringLiteral( "13:20:00" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( QStringLiteral( "1:20:00 pm" ), m_formattedText ); } void FormatTest::testSpecialFormat() { Okular::FormFieldText *fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "CEP" ) ] ); // This field will just become itself, so we test only if keystroke worked. fft->setText( QStringLiteral( "12345" ) ); bool ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); QCOMPARE( true, ok ); fft->setText( QStringLiteral( "123456" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( false, ok ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "8Digits" ) ] ); fft->setText( QStringLiteral( "123456789" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( true, ok ); QCOMPARE( m_formattedText, QStringLiteral( "12345-6789" ) ); fft->setText( QStringLiteral( "1234567890" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( false, ok ); QCOMPARE( m_formattedText, QStringLiteral( "12345-6789" ) ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "telefone" ) ] ); fft->setText( QStringLiteral( "1234567890" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( true, ok ); QCOMPARE( m_formattedText, QStringLiteral("(123) 456-7890" ) ); fft->setText( QStringLiteral( "12345678900" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( false, ok ); QCOMPARE( m_formattedText, QStringLiteral("(123) 456-7890" ) ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "CPF" ) ] ); fft->setText( QStringLiteral( "123456789" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( true, ok ); QCOMPARE( m_formattedText, QStringLiteral( "123-45-6789" ) ); fft->setText( QStringLiteral( "1234567890" ) ); ok = false; m_document->processKeystrokeAction( fft->additionalAction( Okular::FormField::FieldModified ), fft, ok ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); QCOMPARE( false, ok ); QCOMPARE( m_formattedText, QStringLiteral( "123-45-6789" ) ); } void FormatTest::cleanupTestCase() { m_document->closeDocument(); delete m_document; } QTEST_MAIN( FormatTest ) #include "formattest.moc" diff --git a/core/script/kjs_util.cpp b/core/script/kjs_util.cpp index 701a1dbc4..42782c726 100644 --- a/core/script/kjs_util.cpp +++ b/core/script/kjs_util.cpp @@ -1,129 +1,131 @@ /*************************************************************************** * Copyright (C) 2008 by Pino Toscano * * Copyright (C) 2008 by Harri Porten * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ #include "kjs_util_p.h" #include #include #include #include #include #include #include #include using namespace Okular; static KJSPrototype *g_utilProto; static KJSObject crackURL( KJSContext *context, void *, const KJSArguments &arguments ) { if ( arguments.count() < 1 ) { return context->throwException( QStringLiteral("Missing URL argument") ); } QString cURL = arguments.at( 0 ).toString( context ); QUrl url(QUrl::fromLocalFile(cURL) ); if ( !url.isValid() ) { return context->throwException( QStringLiteral("Invalid URL") ); } if ( url.scheme() != QLatin1String( "file" ) || url.scheme() != QLatin1String( "http" ) || url.scheme() != QLatin1String( "https" ) ) { return context->throwException( QStringLiteral("Protocol not valid: '") + url.scheme() + QLatin1Char('\'') ); } KJSObject obj; obj.setProperty( context, QStringLiteral("cScheme"), url.scheme() ); if ( !url.userName().isEmpty() ) obj.setProperty( context, QStringLiteral("cUser"), url.userName() ); if ( !url.password().isEmpty() ) obj.setProperty( context, QStringLiteral("cPassword"), url.password() ); obj.setProperty( context, QStringLiteral("cHost"), url.host() ); obj.setProperty( context, QStringLiteral("nPort"), url.port( 80 ) ); // TODO cPath (Optional) The path portion of the URL. // TODO cParameters (Optional) The parameter string portion of the URL. if ( url.hasFragment() ) obj.setProperty( context, QStringLiteral("cFragments"), url.fragment(QUrl::FullyDecoded) ); return obj; } static KJSObject printd( KJSContext *context, void *, const KJSArguments &arguments ) { if ( arguments.count() < 2 ) { return context->throwException( QStringLiteral("Invalid arguments") ); } KJSObject oFormat = arguments.at( 0 ); QString format; if( oFormat.isNumber() ) { int formatType = oFormat.toInt32( context ); switch( formatType ) { case 0: format = QStringLiteral( "D:yyyyMMddHHmmss" ); break; case 1: format = QStringLiteral( "yyyy.MM.dd HH:mm:ss"); break; case 2: QLocale system = QLocale::system(); format = system.dateTimeFormat( QLocale::ShortFormat ) + QStringLiteral( ":ss" ); break; } } else { format = arguments.at( 0 ).toString( context ).replace( "tt", "ap" ); format.replace( "t", "a" ); for( int i = 0 ; i < format.size() ; ++i ) { if( format[i] == 'M' ) format[i] = 'm'; else if( format[i] == 'm' ) format[i] = 'M'; } } QLocale locale( "en_US" ); QStringList str = arguments.at( 1 ).toString( context ).split( QRegularExpression( "\\W") ); QString myStr = QStringLiteral( "%1/%2/%3 %4:%5:%6" ).arg( str[1] ). arg( str[2] ).arg( str[3] ).arg( str[4] ).arg( str[5] ).arg( str[6] ); QDateTime date = locale.toDateTime( myStr, QStringLiteral( "MMM/d/yyyy H:m:s" ) ); - return KJSString( date.toString( format ) ); + QLocale defaultLocale; + + return KJSString( defaultLocale.toString( date, format ) ); } void JSUtil::initType( KJSContext *ctx ) { static bool initialized = false; if ( initialized ) return; initialized = true; g_utilProto = new KJSPrototype(); g_utilProto->defineFunction( ctx, QStringLiteral("crackURL"), crackURL ); g_utilProto->defineFunction( ctx, QStringLiteral("printd"), printd ); } KJSObject JSUtil::object( KJSContext *ctx ) { return g_utilProto->constructObject( ctx, nullptr ); }