Page MenuHomePhabricator
Files F15396934

D15974.diff
No OneTemporary
Actions

D15974.diff
View Options

diff --git a/src/internationalization/PhutilLocale.php b/src/internationalization/PhutilLocale.php
--- a/src/internationalization/PhutilLocale.php
+++ b/src/internationalization/PhutilLocale.php
@@ -39,6 +39,40 @@
/**
+ * Select a gender variant for this locale. By default, locales use a simple
+ * rule with two gender variants, listed in "<male, female>" order.
+ *
+ * @param const `PhutilPerson` gender constant.
+ * @param list<wild> List of variants.
+ * @return string Variant for use.
+ */
+ public function selectGenderVariant($variant, array $translations) {
+ if ($variant == PhutilPerson::SEX_FEMALE) {
+ return end($translations);
+ } else {
+ return reset($translations);
+ }
+ }
+
+
+ /**
+ * Select a plural variant for this locale. By default, locales use a simple
+ * rule with two plural variants, listed in "<singular, plural>" order.
+ *
+ * @param int Plurality of the value.
+ * @param list<wild> List of variants.
+ * @return string Variant for use.
+ */
+ public function selectPluralVariant($variant, array $translations) {
+ if ($variant == 1) {
+ return reset($translations);
+ } else {
+ return end($translations);
+ }
+ }
+
+
+ /**
* Flags a locale as silly, like "English (Pirate)".
*
* These locales are fun but disastrously inappropriate for serious
diff --git a/src/internationalization/PhutilTranslator.php b/src/internationalization/PhutilTranslator.php
--- a/src/internationalization/PhutilTranslator.php
+++ b/src/internationalization/PhutilTranslator.php
@@ -63,8 +63,14 @@
}
public function translate($text /* , ... */) {
- $translation = idx($this->translations, $text, $text);
+ if (isset($this->translations[$text])) {
+ $translation = $this->translations[$text];
+ } else {
+ $translation = $text;
+ }
+
$args = func_get_args();
+
while (is_array($translation)) {
$arg = next($args);
$translation = $this->chooseVariant($translation, $arg);
@@ -154,51 +160,32 @@
return null;
}
- // TODO: Move these into PhutilLocale if benchmarks show we aren't
- // eating too much of a performance cost.
-
- switch ($this->localeCode) {
- case 'en_US':
- case 'en_GB':
- case 'es_ES':
- case 'en_W*':
- case 'en_P*':
- case 'en_R*':
- case 'en_A*':
- list($singular, $plural) = $translations;
- if ($variant == 1) {
- return $singular;
- }
- return $plural;
-
- case 'cs_CZ':
- if ($is_sex) {
- list($male, $female) = $translations;
- if ($variant == PhutilPerson::SEX_FEMALE) {
- return $female;
- }
- return $male;
- }
-
- list($singular, $paucal, $plural) = $translations;
- if ($variant == 1) {
- return $singular;
- }
- if ($variant >= 2 && $variant <= 4) {
- return $paucal;
- }
- return $plural;
+ if ($is_sex) {
+ return $this->locale->selectGenderVariant($variant, $translations);
+ } else {
- case 'ko_KR':
- list($singular, $plural) = $translations;
+ // NOTE: This is a microoptimization which slightly improves performance
+ // for common languages with simple plural rules. Languages do not need
+ // to be added here even if they use the simple rules. The benefit of
+ // inclusion here is small, on the order of 5%.
+ static $simple_plural = array(
+ 'en_US' => true,
+ 'en_GB' => true,
+ 'en_ES' => true,
+ 'ko_KR' => true,
+ );
+
+ if (isset($simple_plural[$this->localeCode])) {
if ($variant == 1) {
- return $singular;
+ return reset($translations);
+ } else {
+ return end($translations);
}
- return $plural;
-
- default:
- throw new Exception(pht("Unknown locale '%s'.", $this->localeCode));
+ } else {
+ return $this->locale->selectPluralVariant($variant, $translations);
+ }
}
+
}
/**
diff --git a/src/internationalization/locales/PhutilCzechLocale.php b/src/internationalization/locales/PhutilCzechLocale.php
--- a/src/internationalization/locales/PhutilCzechLocale.php
+++ b/src/internationalization/locales/PhutilCzechLocale.php
@@ -19,4 +19,18 @@
return true;
}
+ public function selectPluralVariant($variant, array $translations) {
+ list($singular, $paucal, $plural) = $translations;
+
+ if ($variant == 1) {
+ return $singular;
+ }
+
+ if ($variant >= 2 && $variant <= 4) {
+ return $paucal;
+ }
+
+ return $plural;
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 5:03 PM (4 d, 21 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7431328
Default Alt Text
D15974.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility