Commit graph

39 commits

Author SHA1 Message Date
Reedy
f44c1ff158 Add ICU mapping for versions 62 and 63
Change-Id: I5e1238e856d4149c30806e6b2cb3619c0c9c1dbf
2018-10-18 20:03:59 +01:00
Fomafix
5632815976 Write Latin and other scripts with captial letter
Change-Id: I16c660e54191b63cd6eb3407cb00504665930c4e
2018-10-05 18:49:08 +02:00
Pikne
9c46871d60 Remove xx-uca-et collation workaround
Remove workaround introduced in I3e8031b9. No longer needed.

Bug: T202977
Change-Id: I39921ef83cddc33535b99bd9c0b75f8afb52ea9a
2018-09-11 13:33:24 +00:00
Timo Tijhof
3186d2d04b collation: Move first-letters-root to includes/collation/data
For consistency with other data files. Also, like the other data files:

* For automated fetching of the Unicode files,
  move the steps from Makefile to a bash script.

* Switch to a static array file format.

Change-Id: If07487950a270283b8eaeda9a507e723ed2d89c4
2018-08-01 22:40:22 +00:00
Fomafix
0f1858321c Use PHP 7 '??' operator instead of if-then-else
Change-Id: I790b86e2e9e3e41386144637659516a4bfca1cfe
2018-06-12 23:14:18 +02:00
Bartosz Dziewoński
0313128b10 Use PHP 7 "\u{NNNN}" Unicode codepoint escapes in string literals
In cases where we're operating on text data (and not binary data),
use e.g. "\u{00A0}" to refer directly to the Unicode character
'NO-BREAK SPACE' instead of "\xc2\xa0" to specify the bytes C2h A0h
(which correspond to the UTF-8 encoding of that character). This
makes it easier to look up those mysterious sequences, as not all
are as recognizable as the no-break space.

This is not enforced by PHP, but I think we should write those in
uppercase and zero-padded to at least four characters, like the
Unicode standard does.

Note that not all "\xNN" escapes can be automatically replaced:
* We can't use Unicode escapes for binary data that is not UTF-8
  (e.g. in code converting from legacy encodings or testing the
  handling of invalid UTF-8 byte sequences).
* '\xNN' escapes in regular expressions in single-quoted strings
  are actually handled by PCRE and have to be dealt with carefully
  (those regexps should probably be changed to use the /u modifier).
* "\xNN" referring to ASCII characters ("\x7F" and lower) should
  probably be left as-is.

The replacements in this commit were done semi-manually by piping
the existing "\xNN" escapes through the following terrible Ruby
script I devised:

  chars = eval('"' + ARGV[0] + '"').force_encoding('utf-8')
  puts chars.split('').map{|char|
    '\\u{' + char.ord.to_s(16).upcase.rjust(4, '0') + '}'
  }.join('')

Change-Id: Idc3dee3a7fb5ebfaef395754d8859b18f1f8769a
2018-06-04 16:20:13 +00:00
Bartosz Dziewoński
b191e5e860 Use PHP 7 '<=>' operator in 'sort()' callbacks
`$a <=> $b` returns `-1` if `$a` is lesser, `1` if `$b` is lesser,
and `0` if they are equal, which are exactly the values 'sort()'
callbacks are supposed to return.

It also enables the neat idiom `$a[x] <=> $b[x] ?: $a[y] <=> $b[y]`
to sort arrays of objects first by 'x', and by 'y' if they are equal.

* Replace a common pattern like `return $a < $b ? -1 : 1` with the
  new operator (and similar patterns with the variables, the numbers
  or the comparison inverted). Some of the uses were previously not
  correctly handling the variables being equal; this is now
  automatically fixed.
* Also replace `return $a - $b`, which is equivalent to `return
  $a <=> $b` if both variables are integers but less intuitive.
* (Do not replace `return strcmp( $a, $b )`. It is also equivalent
  when both variables are strings, but if any of the variables is not,
  'strcmp()' converts it to a string before comparison, which could
  give different results than '<=>', so changing this would require
  careful review and isn't worth it.)
* Also replace `return $a > $b`, which presumably sort of works most
  of the time (returns `1` if `$b` is lesser, and `0` if they are
  equal or `$a` is lesser) but is erroneous.

Change-Id: I19a3d2fc8fcdb208c10330bd7a42c4e05d7f5cf3
2018-05-30 18:05:20 -07:00
James D. Forrester
70c711a6bc Follow-up If8dfdaf1: Hard-deprecate, drop two uses, other pre-5.3 back-compat code
Change-Id: I1c5eee3fe30d6687d88e07011a3d40b6770d0daf
2018-05-24 17:01:02 -07:00
jenkins-bot
60ee1e8110 Merge "Add unicode mapping for ICU 60 and 61" 2018-05-24 21:46:32 +00:00
Reedy
fdb8724e7f Add unicode mapping for ICU 60 and 61
Change-Id: Ifbbc8d7ecc788bc2c6b07a8ebba46a9648545786
2018-05-24 22:28:19 +01:00
James D. Forrester
a6c4d473de IcuCollation: Deprecate getICUVersion(), no need for PHP53 back-compat
Change-Id: If8dfdaf187b32b7b9a2c09a240416b9f481593f1
2018-05-24 21:23:18 +00:00
Bartosz Dziewoński
390ff7fca1 IcuCollation: Use codepoint as tiebreaker when getting first-letters
This prevents unexpected cuneiform digits from acting as headings for
2 and 3 on category pages.

Bug: T187645
Change-Id: I0424a24769899cb23b28704f97e1002fa44999fd
2018-05-11 06:36:24 +00:00
Umherirrender
23ef520a1c Improve some parameter docs
Change-Id: I31e983d7ac287158101b18ad95779d83537302a2
2018-01-07 11:39:08 +01:00
Reedy
7b3add76b1 Add Unicode to ICU mappings for versions 58 and 59
Change-Id: I87a5e6ce3a44a2be1e6bf8adf2f98cd0a4745574
2017-10-25 23:42:28 +01:00
Umherirrender
f739a8f368 Improve some parameter docs
Add missing @return and @param to function docs and fixed some @param

Change-Id: I810727961057cfdcc274428b239af5975c57468d
2017-09-10 20:32:31 +02:00
Umherirrender
3f1a52805e Use short type bool/int in param documentation
Enable the phpcs sniffs for this and used phpcbf

Change-Id: Iaa36687154ddd2bf663b9dd519f5c99409d37925
2017-08-20 13:20:59 +02:00
Kunal Mehta
d1cf48a397 build: Update mediawiki/mediawiki-codesniffer to 0.10.1
And auto-fix all errors.

The `<exclude-pattern>` stanzas are now included in the default ruleset
and don't need to be repeated.

Change-Id: I928af549dc88ac2c6cb82058f64c7c7f3111598a
2017-07-22 18:24:09 -07:00
Bartosz Dziewoński
98627d4cab IcuCollation: Fix diacritic characters for Aromanian (rup) and Moldovan (mo) headings
They should be Ș, Ț (comma-below) and instead they were cedilla-below (Ş, Ţ).
Same as for Romanian (ro) in 486f64f283.

Both of these languages are unsupported by libicu and so the collations
are unlikely to have been used in practice.

Bug: T171043
Bug: T171044
Change-Id: Idd0d593e73cd784fbef7b75e8985f988f5555e26
2017-07-19 21:49:27 +02:00
Brian Wolff
22cb66c175 Update FIRST_LETTER_VERSION for rowiki changes
Can't just clear cache on production, as this
now uses per-server apc instance.

Follow-up 486f64f283

Change-Id: I88df6d5a91c86ef687543d1a6988e0ec050bbfce
2017-07-19 17:56:38 +00:00
Bartosz Dziewoński
486f64f283 IcuCollation: Fix diacritic characters for Romanian (ro) headings
They should be Ș, Ț (comma-below) and instead they were cedilla-below (Ş, Ţ).

Bug: T168711
Change-Id: I6dc873c3ce93bca3e425439f70d0fb30aecc9533
2017-07-19 16:28:02 +02:00
Timo Tijhof
3a2a707546 Clean up remaining get_class() uses
* get_class()        -> __CLASS__ (same as self::class)
* get_called_class() -> static::class
* get_class($this)   -> static::class

Change-Id: I1888a1897ecf4548a2e5a67a942e5c080dd7e3d3
2017-03-07 22:03:47 +00:00
James D. Forrester
9635dda73a includes: Replace implicit Bugzilla bug numbers with Phab ones
It's unreasonable to expect newbies to know that "bug 12345" means "Task T14345"
except where it doesn't, so let's just standardise on the real numbers.

Change-Id: I6f59febaf8fc96e80f8cfc11f4356283f461142a
2017-02-21 18:13:24 +00:00
Bartosz Dziewoński
611801a38d IcuCollation: Add the current class name to 'first-letters' cache key
Instances of subclasses of IcuCollation with customizations for
specific languages probably shouldn't share this cache with instances
of IcuCollation with the same language.

Change-Id: I06d66d199c99448a3375381baef0366c4d99c8c4
2016-12-15 15:17:56 +01:00
Brian Wolff
779aa4ce5a Add first letter data for bn collation (Standard and Traditional)
This is based solely on looking at the bn.txt collation data
file. It has not been tested by native speakers.

Bug: T148885
Change-Id: Ide926bc5ee8752269ef6a1bfe972e19b7188d193
2016-11-15 16:09:45 -08:00
Bartosz Dziewoński
37b1fc9456 IcuCollation: Do not split $tailoringFirstLetters into verified/not verified
At this point I think it's safe to assume that these mostly work well,
and the split makes maintenance of the alphabetical list more difficult
(some entries were already in wrong order). We've been enabling these
collations for more and more Wikimedia wikis and not hearing about any
problems. Mistakes, if any are present, should be treated like any
other bug.

Also made some comments consistent.

Change-Id: I4b5fbcf4dbbdd4dc194ed821341296171fa64bb0
2016-10-31 16:48:13 +01:00
Brian Wolff
95c299e67f Add firstLetter data for ~50 additional languages
Based on CLDR 29 data files.

This did the relatively easy languages in CLDR 29 (Which is most
of them). I skipped languages with complicated tailoring files.

Change-Id: I8367604f7d3a1cdef9cb4e15813893c8cbfff1ff
2016-10-29 12:10:52 +00:00
Bartosz Dziewoński
cf13e01f38 IcuCollation: Update comments on $tailoringFirstLetters
A few more languages marked as "Verified by native speakers",
based on which collations we've been using in production
on Wikimedia wikis.

(I'm not sure if this makes sense now that we're fairly confident
that these are good in general, but since it's already here...)

Change-Id: I8e1f31fa61509eca8c76a2df4e18638005e68b77
2016-09-22 21:02:15 +00:00
Kaldari
deaf4ff495 Updating $tailoringFirstLetters for Macedonian
Per https://ssl.icu-project.org/trac/browser/icu/trunk/source/data/coll/mk.txt

Bug: T26953
Change-Id: I45938402923a109cfc80f59555af5cede584fc3b
2016-08-08 13:41:28 -07:00
Kaldari
52c1b00dc0 Adding support for numeric collation when using UCA collations
To use, add '-u-kn' to the end of a collation name and set it as
the value for $wgCategoryCollation.

Bug: T8948
Change-Id: Ica7908daf80624fa2648127114d01665e96234c0
2016-07-26 17:29:41 -07:00
jenkins-bot
68978670d2 Merge "Add Unicode to ICU mappings for versions 51-57" 2016-07-21 05:23:22 +00:00
Reedy
997c071301 Add Unicode to ICU mappings for versions 51-57
Change-Id: I35c2cdd2c56b491229f1f6d8b69b1de21af23aab
2016-07-20 20:47:50 +01:00
Amir Sarabadani
7e657277bf Do not collate "ا" and "و" in Persian language for category sort
Bug: T139110
Change-Id: If174e02160c954500233e3a57945e267f2b4ae29
2016-07-20 14:42:50 +00:00
jenkins-bot
fe7649f43e Merge "Add support for icu-ta collation" 2016-05-30 08:12:41 +00:00
Ori Livneh
8fc4dea679 collation: Remove suppressWarnings() for getSortKey()
Small optimization to IcuCollation::fetchFirstLetterData().

This used to suppress / restore warnings once per every letter of
every alphabet. The workaround for string casting and error
suppression is no longer needed as of PHP 5.3, in which the
bug was fixed.

Change-Id: Idd41a509858c0887df4f632b480b387bd74027b2
2016-05-26 17:43:44 +01:00
Brian Wolff
331ac75c0a Add support for icu-ta collation
First letters are based on
https://ssl.icu-project.org/trac/browser/icu/trunk/source/data/coll/ta.txt
This commit has not been verified by a native speaker yet, but
is probably right.

Bug: T75453
Change-Id: Ic9bb3658868917790aa770c99f8f280f2dd3eace
2016-05-25 10:36:12 -04:00
Timo Tijhof
2a86b5a17a collation: Refactor getFirstLetterData() cache handling
* Factor out fetchFirstLetterData() as a separate method.
* Move 'version' into the key instead of checking afterwards.
* Use getWithSetCallback() for the cache handling.
  (Depends on version being in the key).

Change-Id: I15bddf5d1dabcdcef47a938447ba59436bd8a294
2016-05-09 19:02:35 +00:00
Ori Livneh
87f4d002cc Cache first-letter data in APC, if available
I noticed that `frwiki:first-letters:fr🇫🇷4.8.1.1` was at the very top of keys
sorted by bandwidth (that is, reqs/sec * size) on one of the memcache servers
on WMF prod.

The data takes ~60 - 80ms to compute, in case of a cache miss. That's not
enough to justify using a tiered cache abstraction here, IMO.

Change-Id: If81ce8f86f2c378565f1f6a0dd2c04dee825c4e9
2016-04-11 16:52:57 -07:00
addshore
9b44bc863e Add @since tags to Collation stuff
Change-Id: Iec56ac4d1418737d171f8faa9c8f498fba5383ee
2016-04-03 11:37:40 +03:00
addshore
e8c15f0e94 Split Collation.php
Change-Id: I6abfecf91cdce83dd34b1e8aa8e0b35315f62742
2016-04-03 11:23:20 +03:00
Renamed from includes/Collation.php (Browse further)