Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3ecafc5973a62a4a5aba6fd51034f464869443e1 https://github.com/phpmyadmin/phpmyadmin/commit/3ecafc5973a62a4a5aba6fd51034... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M libraries/common.inc.php M libraries/select_lang.inc.php
Log Message: ----------- Move mysql_charset_map to common.inc.php
It should be later removed (as it's IMHO not needed), but we move it out of select_lang.inc.php where it really doesn't belong.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 39771f44c05e5e7c0d1a2f902cfbd52b7cdcac4d https://github.com/phpmyadmin/phpmyadmin/commit/39771f44c05e5e7c0d1a2f902cfb... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M libraries/Header.php M libraries/core.lib.php M test/theme.php
Log Message: ----------- Simplify code
For ages we set $GLOBALS['lang'] to language code, so it's safe to use it here.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fd045a94e71611098a1db3d392bcee8aeee017ab https://github.com/phpmyadmin/phpmyadmin/commit/fd045a94e71611098a1db3d392bc... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: A libraries/Language.php A libraries/LanguageManager.php M libraries/vendor_config.php A test/classes/LanguageTest.php
Log Message: ----------- Initial implementation of LanguageManager
The LanguageManager is responsible for choosing correct language and Language class wraps invididual locales, allows matching and their activation.
Issue #11847
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 342c9a25b54675a631a535dc27c8edd2fdaac3ba https://github.com/phpmyadmin/phpmyadmin/commit/342c9a25b54675a631a535dc27c8... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M libraries/common.inc.php
Log Message: ----------- Switch languge selection to LanguageManager
Issue #11847
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 19f9e830ebbb3bf296c56d46dd8857b515550eed https://github.com/phpmyadmin/phpmyadmin/commit/19f9e830ebbb3bf296c56d46dd88... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: R libraries/select_lang.inc.php R libraries/select_lang.lib.php M test/classes/HeaderTest.php M test/classes/MenuTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/core/PMA_warnMissingExtension_test.php R test/libraries/select_lang/PMA_langDetails_test.php R test/libraries/select_lang/PMA_langList_test.php R test/libraries/select_lang/PMA_langName_test.php R test/libraries/select_lang/locale_gettext_test.php
Log Message: ----------- Remove no longer needed code for language selection
Issue #11847
Signed-off-by: Michal Čihař michal@cihar.com
Commit: bd779eeaea3f4ec95646d1608fa3dc1ba7208958 https://github.com/phpmyadmin/phpmyadmin/commit/bd779eeaea3f4ec95646d1608fa3... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M libraries/Language.php M libraries/LanguageManager.php M libraries/display_select_lang.lib.php
Log Message: ----------- Implement language selection using LanguageManager
Issue #11847
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 908c44c027e0e16e56e609dc9c2f6b40e5afe0a0 https://github.com/phpmyadmin/phpmyadmin/commit/908c44c027e0e16e56e609dc9c2f... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M index.php M test/classes/controllers/ServerCollationsControllerTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php M test/libraries/PMA_insert_edit_test.php
Log Message: ----------- Remove no longer used variables
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 25260a0a94cddfe0766ab6096164a735b9762dbe https://github.com/phpmyadmin/phpmyadmin/commit/25260a0a94cddfe0766ab6096164... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M test/bootstrap-dist.php
Log Message: ----------- Ensure we initialize language before running tests
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b450e58dbb8f8c80d8239a7021632e5cb41c1435 https://github.com/phpmyadmin/phpmyadmin/commit/b450e58dbb8f8c80d8239a702163... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M test/classes/AdvisorTest.php M test/classes/ConfigGeneratorTest.php M test/classes/ConfigTest.php M test/classes/DbQbeTest.php M test/classes/DbSearchTest.php M test/classes/DisplayResultsTest.php M test/classes/FooterTest.php M test/classes/HeaderTest.php M test/classes/IndexTest.php M test/classes/LanguageTest.php M test/classes/MenuTest.php M test/classes/MessageTest.php M test/classes/PDFTest.php M test/classes/ServerStatusDataTest.php M test/classes/StorageEngineTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/ThemeTest.php M test/classes/TrackerTest.php M test/classes/TypesMySQLTest.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/controllers/ServerCollationsControllerTest.php M test/classes/controllers/ServerDatabasesControllerTest.php M test/classes/controllers/ServerEnginesControllerTest.php M test/classes/controllers/ServerPluginsControllerTest.php M test/classes/controllers/ServerVariablesControllerTest.php M test/classes/controllers/TableIndexesControllerTest.php M test/classes/controllers/TableRelationControllerTest.php M test/classes/dbi/DBIMysqlTest.php M test/classes/dbi/DBIMysqliTest.php M test/classes/engines/BdbTest.php M test/classes/engines/InnodbTest.php M test/classes/engines/MemoryTest.php M test/classes/engines/MyisamTest.php M test/classes/engines/NdbclusterTest.php M test/classes/engines/PbxtTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NavigationTreeTest.php M test/classes/navigation/NodeColumnContainerTest.php M test/classes/navigation/NodeColumnTest.php M test/classes/navigation/NodeDatabaseChildTest.php M test/classes/navigation/NodeDatabaseTest.php M test/classes/navigation/NodeEventContainerTest.php M test/classes/navigation/NodeFactoryTest.php M test/classes/navigation/NodeFunctionContainerTest.php M test/classes/navigation/NodeFunctionTest.php M test/classes/navigation/NodeIndexContainerTest.php M test/classes/navigation/NodeIndexTest.php M test/classes/navigation/NodeProcedureContainerTest.php M test/classes/navigation/NodeProcedureTest.php M test/classes/navigation/NodeTableContainerTest.php M test/classes/navigation/NodeTableTest.php M test/classes/navigation/NodeTriggerContainerTest.php M test/classes/navigation/NodeViewContainerTest.php M test/classes/navigation/NodeViewTest.php M test/classes/plugin/auth/AuthenticationConfigTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php M test/classes/plugin/auth/AuthenticationSignonTest.php M test/classes/plugin/export/ExportCodegenTest.php M test/classes/plugin/export/ExportCsvTest.php M test/classes/plugin/export/ExportExcelTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportJsonTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportMediawikiTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportPdfTest.php M test/classes/plugin/export/ExportPhparrayTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/export/ExportYamlTest.php M test/classes/plugin/export/TablePropertyTest.php M test/classes/plugin/import/ImportCsvTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportMediawikiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/classes/plugin/import/ImportShpTest.php M test/classes/plugin/import/ImportSqlTest.php M test/classes/plugin/import/ImportXmlTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php M test/classes/schema/DiaRelationSchemaTest.php M test/classes/schema/EpsRelationSchemaTest.php M test/classes/schema/ExportRelationSchemaTest.php M test/classes/schema/PdfRelationSchemaTest.php M test/classes/schema/SvgRelationSchemaTest.php M test/libraries/Files_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_Form_Processing_test.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_browse_foreigners_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_display_change_password_test.php M test/libraries/PMA_display_create_table_test.php M test/libraries/PMA_display_export_test.php M test/libraries/PMA_generateCommonUrl_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_ip_allow_deny_test.php M test/libraries/PMA_kanji-encoding_test.php M test/libraries/PMA_mult_submits_test.php M test/libraries/PMA_mysql_charsets_test.php M test/libraries/PMA_normalization_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_sanitize_test.php M test/libraries/PMA_select_server_test.php M test/libraries/PMA_server_binlog_test.php M test/libraries/PMA_server_common_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_replication_test.php M test/libraries/PMA_server_status_advisor_test.php M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_processes_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php M test/libraries/PMA_server_status_variables_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_server_users_test.php M test/libraries/PMA_sql_query_form_test.php M test/libraries/PMA_tbl_tracking_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/PMA_zip_extension_test.php M test/libraries/common/PMA_browseUploadFile_test.php M test/libraries/common/PMA_buildActionTitles_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/common/PMA_expandUserString_test.php M test/libraries/common/PMA_formatNumberByteDown_test.php M test/libraries/common/PMA_getDbLink_test.php M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php M test/libraries/common/PMA_getTitleForTarget_test.php M test/libraries/common/PMA_localisedDateTimespan_test.php M test/libraries/common/PMA_showDocu_test.php M test/libraries/common/PMA_showPHPDocu_test.php M test/libraries/config/PMA_messages_inc_test.php M test/libraries/core/PMA_array_test.php M test/libraries/core/PMA_checkPageValidity_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_get_real_size_test.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/core/PMA_ifSetOr_test.php M test/libraries/core/PMA_isValid_test.php M test/libraries/core/PMA_securePath_test.php M test/libraries/core/PMA_warnMissingExtension_test.php M test/libraries/database_interface_test.php M test/libraries/php-gettext/Locales_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
Log Message: ----------- Remove require of libraries included in test bootstrap
There is no need to specify them in every test when we already do it globally.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b554a72d95c90f668de77b705ca2892df1c7b231 https://github.com/phpmyadmin/phpmyadmin/commit/b554a72d95c90f668de77b705ca2... Author: Michal Čihař michal@cihar.com Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths: M index.php M libraries/Header.php A libraries/Language.php A libraries/LanguageManager.php M libraries/common.inc.php M libraries/core.lib.php M libraries/display_select_lang.lib.php R libraries/select_lang.inc.php R libraries/select_lang.lib.php M libraries/vendor_config.php M test/bootstrap-dist.php M test/classes/AdvisorTest.php M test/classes/ConfigGeneratorTest.php M test/classes/ConfigTest.php M test/classes/DbQbeTest.php M test/classes/DbSearchTest.php M test/classes/DisplayResultsTest.php M test/classes/FooterTest.php M test/classes/HeaderTest.php M test/classes/IndexTest.php A test/classes/LanguageTest.php M test/classes/MenuTest.php M test/classes/MessageTest.php M test/classes/PDFTest.php M test/classes/ServerStatusDataTest.php M test/classes/StorageEngineTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/ThemeTest.php M test/classes/TrackerTest.php M test/classes/TypesMySQLTest.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/controllers/ServerCollationsControllerTest.php M test/classes/controllers/ServerDatabasesControllerTest.php M test/classes/controllers/ServerEnginesControllerTest.php M test/classes/controllers/ServerPluginsControllerTest.php M test/classes/controllers/ServerVariablesControllerTest.php M test/classes/controllers/TableIndexesControllerTest.php M test/classes/controllers/TableRelationControllerTest.php M test/classes/dbi/DBIMysqlTest.php M test/classes/dbi/DBIMysqliTest.php M test/classes/engines/BdbTest.php M test/classes/engines/InnodbTest.php M test/classes/engines/MemoryTest.php M test/classes/engines/MyisamTest.php M test/classes/engines/NdbclusterTest.php M test/classes/engines/PbxtTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NavigationTreeTest.php M test/classes/navigation/NodeColumnContainerTest.php M test/classes/navigation/NodeColumnTest.php M test/classes/navigation/NodeDatabaseChildTest.php M test/classes/navigation/NodeDatabaseTest.php M test/classes/navigation/NodeEventContainerTest.php M test/classes/navigation/NodeFactoryTest.php M test/classes/navigation/NodeFunctionContainerTest.php M test/classes/navigation/NodeFunctionTest.php M test/classes/navigation/NodeIndexContainerTest.php M test/classes/navigation/NodeIndexTest.php M test/classes/navigation/NodeProcedureContainerTest.php M test/classes/navigation/NodeProcedureTest.php M test/classes/navigation/NodeTableContainerTest.php M test/classes/navigation/NodeTableTest.php M test/classes/navigation/NodeTriggerContainerTest.php M test/classes/navigation/NodeViewContainerTest.php M test/classes/navigation/NodeViewTest.php M test/classes/plugin/auth/AuthenticationConfigTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php M test/classes/plugin/auth/AuthenticationSignonTest.php M test/classes/plugin/export/ExportCodegenTest.php M test/classes/plugin/export/ExportCsvTest.php M test/classes/plugin/export/ExportExcelTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportJsonTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportMediawikiTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportPdfTest.php M test/classes/plugin/export/ExportPhparrayTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/export/ExportYamlTest.php M test/classes/plugin/export/TablePropertyTest.php M test/classes/plugin/import/ImportCsvTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportMediawikiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/classes/plugin/import/ImportShpTest.php M test/classes/plugin/import/ImportSqlTest.php M test/classes/plugin/import/ImportXmlTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php M test/classes/schema/DiaRelationSchemaTest.php M test/classes/schema/EpsRelationSchemaTest.php M test/classes/schema/ExportRelationSchemaTest.php M test/classes/schema/PdfRelationSchemaTest.php M test/classes/schema/SvgRelationSchemaTest.php M test/libraries/Files_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_Form_Processing_test.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_browse_foreigners_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_display_change_password_test.php M test/libraries/PMA_display_create_table_test.php M test/libraries/PMA_display_export_test.php M test/libraries/PMA_generateCommonUrl_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_ip_allow_deny_test.php M test/libraries/PMA_kanji-encoding_test.php M test/libraries/PMA_mult_submits_test.php M test/libraries/PMA_mysql_charsets_test.php M test/libraries/PMA_normalization_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_sanitize_test.php M test/libraries/PMA_select_server_test.php M test/libraries/PMA_server_binlog_test.php M test/libraries/PMA_server_common_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_replication_test.php M test/libraries/PMA_server_status_advisor_test.php M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_processes_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php M test/libraries/PMA_server_status_variables_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_server_users_test.php M test/libraries/PMA_sql_query_form_test.php M test/libraries/PMA_tbl_tracking_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/PMA_zip_extension_test.php M test/libraries/common/PMA_browseUploadFile_test.php M test/libraries/common/PMA_buildActionTitles_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/common/PMA_expandUserString_test.php M test/libraries/common/PMA_formatNumberByteDown_test.php M test/libraries/common/PMA_getDbLink_test.php M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php M test/libraries/common/PMA_getTitleForTarget_test.php M test/libraries/common/PMA_localisedDateTimespan_test.php M test/libraries/common/PMA_showDocu_test.php M test/libraries/common/PMA_showPHPDocu_test.php M test/libraries/config/PMA_messages_inc_test.php M test/libraries/core/PMA_array_test.php M test/libraries/core/PMA_checkPageValidity_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_get_real_size_test.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/core/PMA_ifSetOr_test.php M test/libraries/core/PMA_isValid_test.php M test/libraries/core/PMA_securePath_test.php M test/libraries/core/PMA_warnMissingExtension_test.php M test/libraries/database_interface_test.php M test/libraries/php-gettext/Locales_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php R test/libraries/select_lang/PMA_langDetails_test.php R test/libraries/select_lang/PMA_langList_test.php R test/libraries/select_lang/PMA_langName_test.php R test/libraries/select_lang/locale_gettext_test.php M test/theme.php
Log Message: ----------- Merge pull request #11848 from nijel/languagemanager
Language selection refactoring
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff21ad8e0e0f...b554a72d95c9
-
Michal Čihař