gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,567 Commits 12 Branches 481 Tags 2.4 GiB
2edb62ca5d
Commit Graph

104567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2edb62ca5d Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:16:14 +01:00
Michal Čihař
ce22861121 Merge branch 'QA_4_5' 2016-01-14 09:14:53 +01:00
Michal Čihař
8ab8b55103 Changelog entry for #11752 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:14:28 +01:00
Michal Čihař
62b51fa9c7 Merge remote-tracking branch 'origin/QA_4_5' 2016-01-14 09:12:33 +01:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
Michal Čihař
14cbfbb84e Merge commit 'd7b3529b992b31b8902680759a3951a081af3ec2' 2016-01-14 09:00:31 +01:00
Weblate
78278c139e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-14 08:58:57 +01:00
Michal Čihař
42c8d35cf0 Translated using Weblate (Vietnamese) 
Currently translated at 85.9% (2759 of 3210 strings)

[CI skip]
 2016-01-14 08:58:56 +01:00
Marc Delisle
a4883280a0 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 08:58:55 +01:00
Erwin Bronkhorst
38c4dc72f2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 08:58:54 +01:00
Michal Čihař
a478437e0e Merge pull request #11832 from devenbansod/fix_11752 
Fix #11752
 2016-01-14 08:58:51 +01:00
Madhura Jayaratne
f2a60e54f4 canvg.js does not seem to be used anymore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 14:05:03 +11:00
Madhura Jayaratne
5adf2eda31 Fix TODO: Generate a random string as the upload_id 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 13:29:56 +11:00
Madhura Jayaratne
56f684e466 Move common code inside the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 13:09:55 +11:00
Madhura Jayaratne
78a4d09c6f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-14 12:51:32 +11:00
Madhura Jayaratne
709ab0ce2b Fix TODO: HTML5 "required" property is mostly supported now 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 12:50:19 +11:00
Weblate
b25e716bc9 Merge remote-tracking branch 'origin/master' 2016-01-14 02:49:15 +01:00
Michal Čihař
c79858106b Translated using Weblate (Vietnamese) 
Currently translated at 87.1% (2803 of 3217 strings)

[CI skip]
 2016-01-14 02:49:15 +01:00
Erwin Bronkhorst
901caf4a4d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-14 02:49:12 +01:00
Madhura Jayaratne
126d7b125e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-14 12:37:58 +11:00
Madhura Jayaratne
c60c33377d Fix TODO: Use finally as it's available in PHP >= 5.5 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 12:36:18 +11:00
Marc Delisle
dc75d09c12 Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-13 12:38:44 +01:00
Michal Čihař
ccd6163563 Add test for getting MySQL locale 
Issue #11789

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-13 08:51:56 +01:00
Michal Čihař
cbca7ca202 Show MySQL error messages in user language 
Fixes #11789

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-13 08:49:02 +01:00
Michal Čihař
8813090359 Add infrastructure to map language to MySQL locale 
Issue #11789

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-13 08:44:24 +01:00
Michal Čihař
60b7bb1733 Add method for getting current language 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-13 08:30:23 +01:00
Thành Phạm
d7b3529b99 Translated using Weblate (Vietnamese) 
Currently translated at 2.3% (77 of 3210 strings)

[CI skip]
 2016-01-13 08:03:32 +01:00
Michal Čihař
b554a72d95 Merge pull request #11848 from nijel/languagemanager 
Language selection refactoring
 2016-01-12 17:18:58 +01:00
Michal Čihař
b450e58dbb 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>
 2016-01-12 16:43:16 +01:00
Michal Čihař
25260a0a94 Ensure we initialize language before running tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 16:41:21 +01:00
Michal Čihař
908c44c027 Remove no longer used variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:08 +01:00
Michal Čihař
bd779eeaea Implement language selection using LanguageManager 
Issue #11847

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:08 +01:00
Michal Čihař
19f9e830eb Remove no longer needed code for language selection 
Issue #11847

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:08 +01:00
Michal Čihař
342c9a25b5 Switch languge selection to LanguageManager 
Issue #11847

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:07 +01:00
Michal Čihař
fd045a94e7 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>
 2016-01-12 14:51:07 +01:00
Michal Čihař
39771f44c0 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>
 2016-01-12 14:50:13 +01:00
Michal Čihař
3ecafc5973 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>
 2016-01-12 14:50:13 +01:00
Michal Čihař
ff21ad8e0e Remove unused use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:49:40 +01:00
Atul Pratap Singh
ea9a8aeadd Merge branch 'QA_4_5' 2016-01-12 18:43:51 +05:30
Atul Pratap Singh
f03d49e674 Merge commit '0f23dd5' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:
	js/messages.php
 2016-01-12 18:43:15 +05:30
Weblate
6b781d7fd7 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-12 14:04:30 +01:00
Xosé Calvo
5b577198bb Translated using Weblate (Galician) 
Currently translated at 85.0% (2730 of 3210 strings)

[CI skip]
 2016-01-12 14:04:28 +01:00
Marc Delisle
814ea29854 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-12 14:04:28 +01:00
Kristjan Räts
5613c32029 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-12 14:04:28 +01:00
Atul Pratap Singh
0f23dd51d8 Add localStorage availability checks, update the error message 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-12 18:30:04 +05:30
Marc Delisle
c32e2ed3a5 Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-12 12:37:13 +01:00
Madhura Jayaratne
682f5eb79a Remove more removeProp() function calls 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:25:04 +11:00
Madhura Jayaratne
702fc182ae Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-12 20:22:58 +11:00
Madhura Jayaratne
723b4bdfbe Fix #11846 Grid editing window is disabled the second time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:21:12 +11:00
Madhura Jayaratne
614b7d55ab Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:16:27 +11:00