Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageZh_cn.php |
— | — | @@ -48,17 +48,6 @@ |
49 | 49 | 'Integer' => '_num', |
50 | 50 | 'Enumeration' => '_str', |
51 | 51 | 'URI' => '_uri', |
52 | | - // support English aliases: |
53 | | - 'Page' => '_wpg', |
54 | | - 'String' => '_str', |
55 | | - 'Text' => '_txt', |
56 | | - 'Boolean' => '_boo', |
57 | | - 'Number' => '_num', |
58 | | - 'Geographic coordinate' => '_geo', |
59 | | - 'Temperature' => '_tem', |
60 | | - 'Date' => '_dat', |
61 | | - 'Email' => '_ema', |
62 | | - 'Annotation URI' => '_anu' |
63 | 52 | ); |
64 | 53 | |
65 | 54 | protected $m_SpecialProperties = array( |
— | — | @@ -77,18 +66,7 @@ |
78 | 67 | |
79 | 68 | |
80 | 69 | protected $m_SpecialPropertyAliases = array( |
81 | | - 'Display unit' => '_UNIT', |
82 | | -// support English aliases for special properties |
83 | | - 'Has type' => '_TYPE', |
84 | | - 'Equivalent URI' => '_URI', |
85 | | - 'Subproperty of' => '_SUBP', |
86 | | - 'Display units' => '_UNIT', |
87 | | - 'Imported from' => '_IMPO', |
88 | | - 'Corresponds to' => '_CONV', |
89 | | - 'Provides service' => '_SERV', |
90 | | - 'Allows value' => '_PVAL', |
91 | | - 'Modification date' => '_MDAT', |
92 | | - 'Has improper value for' => '_ERRP' |
| 70 | + 'Display unit' => '_UNIT' |
93 | 71 | ); |
94 | 72 | |
95 | 73 | protected $m_Namespaces = array( |
— | — | @@ -100,16 +78,6 @@ |
101 | 79 | SMW_NS_CONCEPT_TALK => 'Concept_talk' // TODO: translate |
102 | 80 | ); |
103 | 81 | |
104 | | -protected $m_NamespaceAliases = array( |
105 | | - // support English aliases for namespaces |
106 | | - 'Property' => SMW_NS_PROPERTY, |
107 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
108 | | - 'Type' => SMW_NS_TYPE, |
109 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
110 | | - 'Concept' => SMW_NS_CONCEPT, |
111 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
112 | | -); |
113 | | - |
114 | 82 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_MDY,SMW_DMY,SMW_YMD,SMW_YDM)); |
115 | 83 | |
116 | 84 | protected $m_months = array("1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageAr.php |
— | — | @@ -59,8 +59,6 @@ |
60 | 60 | ); |
61 | 61 | |
62 | 62 | protected $m_SpecialPropertyAliases = array( |
63 | | - 'Modification date' => '_MDAT', |
64 | | - 'Has improper value for' => '_ERRP', |
65 | 63 | 'عرض الوحدة' => '_UNIT' |
66 | 64 | ); |
67 | 65 | |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageEn.php |
— | — | @@ -23,6 +23,8 @@ |
24 | 24 | */ |
25 | 25 | class SMWLanguageEn extends SMWLanguage { |
26 | 26 | |
| 27 | +protected $m_useEnDefaultAliases = false; //not needed for English, obviously |
| 28 | + |
27 | 29 | protected $m_DatatypeLabels = array( |
28 | 30 | '_wpg' => 'Page', // name of page datatype |
29 | 31 | '_str' => 'String', // name of the string type |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageEs.php |
— | — | @@ -42,17 +42,6 @@ |
43 | 43 | 'Número entero' => '_num', |
44 | 44 | 'Número con coma' => '_num', |
45 | 45 | 'Enumeración' => '_str', |
46 | | - // support English aliases: |
47 | | - 'Page' => '_wpg', |
48 | | - 'String' => '_str', |
49 | | - 'Text' => '_txt', |
50 | | - 'Boolean' => '_boo', |
51 | | - 'Number' => '_num', |
52 | | - 'Geographic coordinate' => '_geo', |
53 | | - 'Temperature' => '_tem', |
54 | | - 'Date' => '_dat', |
55 | | - 'Email' => '_ema', |
56 | | - 'Annotation URI' => '_anu' |
57 | 46 | ); |
58 | 47 | |
59 | 48 | protected $m_SpecialProperties = array( |
— | — | @@ -71,17 +60,6 @@ |
72 | 61 | |
73 | 62 | protected $m_SpecialPropertyAliases = array( |
74 | 63 | 'Unidad de medida' => '_UNIT', |
75 | | - // support English aliases for special properties |
76 | | - 'Has type' => '_TYPE', |
77 | | - 'Equivalent URI' => '_URI', |
78 | | - 'Subproperty of' => '_SUBP', |
79 | | - 'Display units' => '_UNIT', |
80 | | - 'Imported from' => '_IMPO', |
81 | | - 'Corresponds to' => '_CONV', |
82 | | - 'Provides service' => '_SERV', |
83 | | - 'Allows value' => '_PVAL', |
84 | | - 'Modification date' => '_MDAT', |
85 | | - 'Has improper value for' => '_ERRP' |
86 | 64 | ); |
87 | 65 | |
88 | 66 | protected $m_Namespaces = array( |
— | — | @@ -93,16 +71,6 @@ |
94 | 72 | SMW_NS_CONCEPT_TALK => 'Concept_talk' // TODO: translate |
95 | 73 | ); |
96 | 74 | |
97 | | -protected $m_NamespaceAliases = array( |
98 | | - // support English aliases for namespaces |
99 | | - 'Property' => SMW_NS_PROPERTY, |
100 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
101 | | - 'Type' => SMW_NS_TYPE, |
102 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
103 | | - 'Concept' => SMW_NS_CONCEPT, |
104 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
105 | | -); |
106 | | - |
107 | 75 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_MDY,SMW_DMY,SMW_YMD,SMW_YDM)); |
108 | 76 | |
109 | 77 | protected $m_months = array("enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageFr.php |
— | — | @@ -42,17 +42,6 @@ |
43 | 43 | 'Nombre entier' => '_num', |
44 | 44 | 'Nombre décimal' => '_num', |
45 | 45 | 'Énumeration' => '_str', |
46 | | - // support English aliases: |
47 | | - 'Page' => '_wpg', |
48 | | - 'String' => '_str', |
49 | | - 'Text' => '_txt', |
50 | | - 'Boolean' => '_boo', |
51 | | - 'Number' => '_num', |
52 | | - 'Geographic coordinate' => '_geo', |
53 | | - 'Temperature' => '_tem', |
54 | | - 'Date' => '_dat', |
55 | | - 'Email' => '_ema', |
56 | | - 'Annotation URI' => '_anu' |
57 | 46 | ); |
58 | 47 | |
59 | 48 | protected $m_SpecialProperties = array( |
— | — | @@ -71,17 +60,6 @@ |
72 | 61 | |
73 | 62 | protected $m_SpecialPropertyAliases = array( |
74 | 63 | 'Unité de mesure' => '_UNIT', |
75 | | - // support English aliases for special properties |
76 | | - 'Has type' => '_TYPE', |
77 | | - 'Equivalent URI' => '_URI', |
78 | | - 'Subproperty of' => '_SUBP', |
79 | | - 'Display units' => '_UNIT', |
80 | | - 'Imported from' => '_IMPO', |
81 | | - 'Corresponds to' => '_CONV', |
82 | | - 'Provides service' => '_SERV', |
83 | | - 'Allows value' => '_PVAL', |
84 | | - 'Modification date' => '_MDAT', |
85 | | - 'Has improper value for' => '_ERRP' |
86 | 64 | ); |
87 | 65 | |
88 | 66 | protected $m_Namespaces = array( |
— | — | @@ -93,16 +71,6 @@ |
94 | 72 | SMW_NS_CONCEPT_TALK => 'Concept_talk' // TODO: translate |
95 | 73 | ); |
96 | 74 | |
97 | | -protected $m_NamespaceAliases = array( |
98 | | - // support English aliases for namespaces |
99 | | - 'Property' => SMW_NS_PROPERTY, |
100 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
101 | | - 'Type' => SMW_NS_TYPE, |
102 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
103 | | - 'Concept' => SMW_NS_CONCEPT, |
104 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
105 | | -); |
106 | | - |
107 | 75 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_MDY,SMW_DMY,SMW_YMD,SMW_YDM)); |
108 | 76 | |
109 | 77 | protected $m_months = array("janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageNl.php |
— | — | @@ -44,17 +44,6 @@ |
45 | 45 | 'Integer' => '_num', |
46 | 46 | 'Float' => '_num', |
47 | 47 | 'Opsomming' => '_str', |
48 | | - // support English aliases: |
49 | | - 'Page' => '_wpg', |
50 | | - 'String' => '_str', |
51 | | - 'Text' => '_txt', |
52 | | - 'Boolean' => '_boo', |
53 | | - 'Number' => '_num', |
54 | | - 'Geographic coordinate' => '_geo', |
55 | | - 'Temperature' => '_tem', |
56 | | - 'Date' => '_dat', |
57 | | - 'Email' => '_ema', |
58 | | - 'Annotation URI' => '_anu' |
59 | 48 | ); |
60 | 49 | |
61 | 50 | protected $m_SpecialProperties = array( |
— | — | @@ -71,20 +60,6 @@ |
72 | 61 | '_ERRP' => 'Has improper value for' // TODO: translate |
73 | 62 | ); |
74 | 63 | |
75 | | -protected $m_SpecialPropertyAliases = array( |
76 | | - // support English aliases for special properties |
77 | | - 'Has type' => '_TYPE', |
78 | | - 'Equivalent URI' => '_URI', |
79 | | - 'Subproperty of' => '_SUBP', |
80 | | - 'Display units' => '_UNIT', |
81 | | - 'Imported from' => '_IMPO', |
82 | | - 'Corresponds to' => '_CONV', |
83 | | - 'Provides service' => '_SERV', |
84 | | - 'Allows value' => '_PVAL', |
85 | | - 'Modification date' => '_MDAT', |
86 | | - 'Has improper value for' => '_ERRP' |
87 | | -); |
88 | | - |
89 | 64 | protected $m_Namespaces = array( |
90 | 65 | SMW_NS_PROPERTY => 'Eigenschap', |
91 | 66 | SMW_NS_PROPERTY_TALK => 'Overleg_eigenschap', |
— | — | @@ -94,16 +69,6 @@ |
95 | 70 | SMW_NS_CONCEPT_TALK => 'Overleg_concept' |
96 | 71 | ); |
97 | 72 | |
98 | | -protected $m_NamespaceAliases = array( |
99 | | - // support English aliases for namespaces |
100 | | - 'Property' => SMW_NS_PROPERTY, |
101 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
102 | | - 'Type' => SMW_NS_TYPE, |
103 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
104 | | - 'Concept' => SMW_NS_CONCEPT, |
105 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
106 | | -); |
107 | | - |
108 | 73 | protected $m_months = array('januari','februari','maart','april','mei','juni','juli','augustus','september','oktober','november','december'); |
109 | 74 | |
110 | 75 | protected $m_monthsshort = array("jan", "feb", "mar", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguagePl.php |
— | — | @@ -61,21 +61,6 @@ |
62 | 62 | 'Liczba zmiennoprzecinkowa' => '_num', |
63 | 63 | 'Liczba całkowita' => '_num', |
64 | 64 | 'Wyliczenie' => '_str', |
65 | | - // support English aliases: |
66 | | - 'URI' => '_uri', |
67 | | - 'Float' => '_num', |
68 | | - 'Integer' => '_num', |
69 | | - 'Enumeration' => '_str', |
70 | | - 'Page' => '_wpg', |
71 | | - 'String' => '_str', |
72 | | - 'Text' => '_txt', |
73 | | - 'Boolean' => '_boo', |
74 | | - 'Number' => '_num', |
75 | | - 'Geographic coordinate' => '_geo', |
76 | | - 'Temperature' => '_tem', |
77 | | - 'Date' => '_dat', |
78 | | - 'Email' => '_ema', |
79 | | - 'Annotation URI' => '_anu' |
80 | 65 | ); |
81 | 66 | |
82 | 67 | protected $m_SpecialProperties = array( |
— | — | @@ -94,17 +79,6 @@ |
95 | 80 | |
96 | 81 | protected $m_SpecialPropertyAliases = array( |
97 | 82 | 'Wyświetlana jednostka' => '_UNIT', |
98 | | - // support English aliases for special properties |
99 | | - 'Has type' => '_TYPE', |
100 | | - 'Equivalent URI' => '_URI', |
101 | | - 'Subproperty of' => '_SUBP', |
102 | | - 'Display units' => '_UNIT', |
103 | | - 'Imported from' => '_IMPO', |
104 | | - 'Corresponds to' => '_CONV', |
105 | | - 'Provides service' => '_SERV', |
106 | | - 'Allows value' => '_PVAL', |
107 | | - 'Modification date' => '_MDAT', |
108 | | - 'Has improper value for' => '_ERRP' |
109 | 83 | ); |
110 | 84 | |
111 | 85 | |
— | — | @@ -117,16 +91,6 @@ |
118 | 92 | SMW_NS_CONCEPT_TALK => 'Dyskusja pojęcia' |
119 | 93 | ); |
120 | 94 | |
121 | | -protected $m_NamespaceAliases = array( |
122 | | - // support English aliases for namespaces |
123 | | - 'Property' => SMW_NS_PROPERTY, |
124 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
125 | | - 'Type' => SMW_NS_TYPE, |
126 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
127 | | - 'Concept' => SMW_NS_CONCEPT, |
128 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
129 | | -); |
130 | | - |
131 | 95 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_MDY,SMW_DMY,SMW_YMD,SMW_YDM)); |
132 | 96 | |
133 | 97 | protected $m_months = array("styczeń", "luty", "marsz", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageIt.php |
— | — | @@ -63,17 +63,6 @@ |
64 | 64 | |
65 | 65 | protected $m_SpecialPropertyAliases = array( |
66 | 66 | 'Display unit' => '_UNIT', |
67 | | - // support English aliases for special properties |
68 | | - 'Has type' => '_TYPE', |
69 | | - 'Equivalent URI' => '_URI', |
70 | | - 'Subproperty of' => '_SUBP', |
71 | | - 'Display units' => '_UNIT', |
72 | | - 'Imported from' => '_IMPO', |
73 | | - 'Corresponds to' => '_CONV', |
74 | | - 'Provides service' => '_SERV', |
75 | | - 'Allows value' => '_PVAL', |
76 | | - 'Modification date' => '_MDAT', |
77 | | - 'Has improper value for' => '_ERRP' |
78 | 67 | ); |
79 | 68 | |
80 | 69 | protected $m_Namespaces = array( // TODO: translate (English aliases can be kept, see other language files |
— | — | @@ -85,16 +74,6 @@ |
86 | 75 | SMW_NS_CONCEPT_TALK => 'Concept_talk' |
87 | 76 | ); |
88 | 77 | |
89 | | -protected $m_NamespaceAliases = array( |
90 | | - // support English aliases for namespaces |
91 | | - 'Property' => SMW_NS_PROPERTY, |
92 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
93 | | - 'Type' => SMW_NS_TYPE, |
94 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
95 | | - 'Concept' => SMW_NS_CONCEPT, |
96 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
97 | | -); |
98 | | - |
99 | 78 | } |
100 | 79 | |
101 | 80 | |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageSk.php |
— | — | @@ -40,18 +40,7 @@ |
41 | 41 | protected $m_DatatypeAliases = array( |
42 | 42 | 'URI' => '_uri', |
43 | 43 | 'Celé číslo' => '_num', |
44 | | - 'Desatinné číslo' => '_num', |
45 | | - // support English aliases: |
46 | | - 'Page' => '_wpg', |
47 | | - 'String' => '_str', |
48 | | - 'Text' => '_txt', |
49 | | - 'Boolean' => '_boo', |
50 | | - 'Number' => '_num', |
51 | | - 'Geographic coordinate' => '_geo', |
52 | | - 'Temperature' => '_tem', |
53 | | - 'Date' => '_dat', |
54 | | - 'Email' => '_ema', |
55 | | - 'Annotation URI' => '_anu' |
| 44 | + 'Desatinné číslo' => '_num' |
56 | 45 | ); |
57 | 46 | |
58 | 47 | protected $m_SpecialProperties = array( |
— | — | @@ -69,21 +58,9 @@ |
70 | 59 | ); |
71 | 60 | |
72 | 61 | protected $m_SpecialPropertyAliases = array( |
73 | | - 'Zobrazovacia jednotka' => '_UNIT', |
74 | | - // support English aliases for special properties |
75 | | - 'Has type' => '_TYPE', |
76 | | - 'Equivalent URI' => '_URI', |
77 | | - 'Subproperty of' => '_SUBP', |
78 | | - 'Display units' => '_UNIT', |
79 | | - 'Imported from' => '_IMPO', |
80 | | - 'Corresponds to' => '_CONV', |
81 | | - 'Provides service' => '_SERV', |
82 | | - 'Allows value' => '_PVAL', |
83 | | - 'Modification date' => '_MDAT', |
84 | | - 'Has improper value for' => '_ERRP' |
| 62 | + 'Zobrazovacia jednotka' => '_UNIT' |
85 | 63 | ); |
86 | 64 | |
87 | | - |
88 | 65 | protected $m_Namespaces = array( |
89 | 66 | SMW_NS_PROPERTY => 'Atribút', |
90 | 67 | SMW_NS_PROPERTY_TALK => 'Diskusia o atribúte', |
— | — | @@ -93,16 +70,6 @@ |
94 | 71 | SMW_NS_CONCEPT_TALK => 'Concept_talk' // TODO: translate |
95 | 72 | ); |
96 | 73 | |
97 | | -protected $m_NamespaceAliases = array( |
98 | | - // support English aliases for namespaces |
99 | | - 'Property' => SMW_NS_PROPERTY, |
100 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
101 | | - 'Type' => SMW_NS_TYPE, |
102 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
103 | | - 'Concept' => SMW_NS_CONCEPT, |
104 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
105 | | -); |
106 | | - |
107 | 74 | } |
108 | 75 | |
109 | 76 | |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_Language.php |
— | — | @@ -36,6 +36,45 @@ |
37 | 37 | /// each case, and the constants define the obvious order (e.g. SMW_YDM means "first Year, |
38 | 38 | /// then Day, then Month). Unlisted combinations will not be accepted at all. |
39 | 39 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_DMY,SMW_MDY,SMW_YMD,SMW_YDM)); |
| 40 | + /// Should English default aliases be used in this language? |
| 41 | + protected $m_useEnDefaultAliases = true; |
| 42 | + /// Default English aliases for namespaces (typically used in all languages) |
| 43 | + static protected $enNamespaceAliases = array( |
| 44 | + 'Property' => SMW_NS_PROPERTY, |
| 45 | + 'Property_talk' => SMW_NS_PROPERTY_TALK, |
| 46 | + 'Type' => SMW_NS_TYPE, |
| 47 | + 'Type_talk' => SMW_NS_TYPE_TALK, |
| 48 | + 'Concept' => SMW_NS_CONCEPT, |
| 49 | + 'Concept_talk' => SMW_NS_CONCEPT_TALK |
| 50 | + ); |
| 51 | + /// Default English aliases for namespaces (typically used in all languages) |
| 52 | + static protected $enDatatypeAliases = array( |
| 53 | + 'URL' => '_uri', |
| 54 | + 'Page' => '_wpg', |
| 55 | + 'String' => '_str', |
| 56 | + 'Text' => '_txt', |
| 57 | + 'Code' => '_cod', |
| 58 | + 'Boolean' => '_boo', |
| 59 | + 'Number' => '_num', |
| 60 | + 'Geographic coordinate' => '_geo', |
| 61 | + 'Temperature' => '_tem', |
| 62 | + 'Date' => '_dat', |
| 63 | + 'Email' => '_ema', |
| 64 | + 'Annotation URI' => '_anu' |
| 65 | + ); |
| 66 | + /// Default English aliases for special property names (typically used in all languages) |
| 67 | + static protected $enPropertyAliases = array( |
| 68 | + 'Has type' => '_TYPE', |
| 69 | + 'Equivalent URI' => '_URI', |
| 70 | + 'Subproperty of' => '_SUBP', |
| 71 | + 'Display units' => '_UNIT', |
| 72 | + 'Imported from' => '_IMPO', |
| 73 | + 'Corresponds to' => '_CONV', |
| 74 | + 'Provides service' => '_SERV', |
| 75 | + 'Allows value' => '_PVAL', |
| 76 | + 'Modification date' => '_MDAT', |
| 77 | + 'Has improper value for' => '_ERRP' |
| 78 | + ); |
40 | 79 | |
41 | 80 | |
42 | 81 | /** |
— | — | @@ -49,7 +88,9 @@ |
50 | 89 | * Function that returns an array of namespace aliases, if any. |
51 | 90 | */ |
52 | 91 | function getNamespaceAliases() { |
53 | | - return $this->m_NamespaceAliases; |
| 92 | + return $this->m_useEnDefaultAliases? |
| 93 | + $this->m_NamespaceAliases + SMWLanguage::$enNamespaceAliases: |
| 94 | + $this->m_NamespaceAliases; |
54 | 95 | } |
55 | 96 | |
56 | 97 | /** |
— | — | @@ -67,7 +108,9 @@ |
68 | 109 | * should also have a primary label defined in m_DatatypeLabels. |
69 | 110 | */ |
70 | 111 | function getDatatypeAliases() { |
71 | | - return $this->m_DatatypeAliases; |
| 112 | + return $this->m_useEnDefaultAliases? |
| 113 | + $this->m_DatatypeAliases + SMWLanguage::$enDatatypeAliases: |
| 114 | + $this->m_DatatypeAliases; |
72 | 115 | } |
73 | 116 | |
74 | 117 | /** |
— | — | @@ -81,7 +124,9 @@ |
82 | 125 | * Aliases for predefined properties, if any. |
83 | 126 | */ |
84 | 127 | function getPropertyAliases() { |
85 | | - return $this->m_SpecialPropertyAliases; |
| 128 | + return $this->m_useEnDefaultAliases? |
| 129 | + $this->m_SpecialPropertyAliases + SMWLanguage::$enPropertyAliases: |
| 130 | + $this->m_SpecialPropertyAliases; |
86 | 131 | } |
87 | 132 | |
88 | 133 | /** |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguagePt.php |
— | — | @@ -42,18 +42,6 @@ |
43 | 43 | 'Número inteiro' => '_num', |
44 | 44 | 'Folga' => '_num', |
45 | 45 | 'Enumeração' => '_str', |
46 | | - // support English aliases: |
47 | | - 'Page' => '_wpg', |
48 | | - 'String' => '_str', |
49 | | - 'Code' => '_cod', |
50 | | - 'Text' => '_txt', |
51 | | - 'Boolean' => '_boo', |
52 | | - 'Number' => '_num', |
53 | | - 'Geographic coordinate' => '_geo', |
54 | | - 'Temperature' => '_tem', |
55 | | - 'Date' => '_dat', |
56 | | - 'Email' => '_ema', |
57 | | - 'Annotation URI' => '_anu' |
58 | 46 | ); |
59 | 47 | |
60 | 48 | protected $m_SpecialProperties = array( |
— | — | @@ -71,18 +59,7 @@ |
72 | 60 | ); |
73 | 61 | |
74 | 62 | protected $m_SpecialPropertyAliases = array( |
75 | | - 'Unidade de amostra' => '_UNIT', |
76 | | - // support English aliases for special properties |
77 | | - 'Has type' => '_TYPE', |
78 | | - 'Equivalent URI' => '_URI', |
79 | | - 'Subproperty of' => '_SUBP', |
80 | | - 'Display units' => '_UNIT', |
81 | | - 'Imported from' => '_IMPO', |
82 | | - 'Corresponds to' => '_CONV', |
83 | | - 'Provides service' => '_SERV', |
84 | | - 'Allows value' => '_PVAL', |
85 | | - 'Modification date' => '_MDAT', |
86 | | - 'Has improper value for' => '_ERRP' |
| 63 | + 'Unidade de amostra' => '_UNIT' |
87 | 64 | ); |
88 | 65 | |
89 | 66 | protected $m_Namespaces = array( |
— | — | @@ -94,17 +71,6 @@ |
95 | 72 | SMW_NS_CONCEPT_TALK => 'Discussão_conceito' |
96 | 73 | ); |
97 | 74 | |
98 | | -protected $m_NamespaceAliases = array( |
99 | | - // support English aliases for namespaces |
100 | | - 'Property' => SMW_NS_PROPERTY, |
101 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
102 | | - 'Type' => SMW_NS_TYPE, |
103 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
104 | | - 'Concept' => SMW_NS_CONCEPT, |
105 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
106 | | -); |
107 | | - |
108 | | - |
109 | 75 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_MDY,SMW_DMY,SMW_YMD,SMW_YDM)); |
110 | 76 | |
111 | 77 | protected $m_months = array("Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageRu.php |
— | — | @@ -42,19 +42,7 @@ |
43 | 43 | 'Целое' => '_num', |
44 | 44 | 'Десятичное' => '_num', |
45 | 45 | 'Плавающее' => '_num', |
46 | | - 'Перечисление' => '_str', |
47 | | - // support English aliases: |
48 | | - 'Page' => '_wpg', |
49 | | - 'String' => '_str', |
50 | | - 'Text' => '_txt', |
51 | | - 'Code' => '_cod', |
52 | | - 'Boolean' => '_boo', |
53 | | - 'Number' => '_num', |
54 | | - 'Geographic coordinate' => '_geo', |
55 | | - 'Temperature' => '_tem', |
56 | | - 'Date' => '_dat', |
57 | | - 'Email' => '_ema', |
58 | | - 'Annotation URI' => '_anu' |
| 46 | + 'Перечисление' => '_str' |
59 | 47 | ); |
60 | 48 | |
61 | 49 | protected $m_SpecialProperties = array( |
— | — | @@ -73,18 +61,7 @@ |
74 | 62 | |
75 | 63 | protected $m_SpecialPropertyAliases = array( |
76 | 64 | 'Тип данных' => '_TYPE', |
77 | | - 'Отображаемая единица' => '_UNIT', |
78 | | - // support English aliases for special properties |
79 | | - 'Has type' => '_TYPE', |
80 | | - 'Equivalent URI' => '_URI', |
81 | | - 'Subproperty of' => '_SUBP', |
82 | | - 'Display units' => '_UNIT', |
83 | | - 'Imported from' => '_IMPO', |
84 | | - 'Corresponds to' => '_CONV', |
85 | | - 'Provides service' => '_SERV', |
86 | | - 'Allows value' => '_PVAL', |
87 | | - 'Modification date' => '_MDAT', |
88 | | - 'Has improper value for' => '_ERRP' |
| 65 | + 'Отображаемая единица' => '_UNIT' |
89 | 66 | ); |
90 | 67 | |
91 | 68 | |
— | — | @@ -97,16 +74,6 @@ |
98 | 75 | SMW_NS_CONCEPT_TALK => 'Обсуждение_концепции' |
99 | 76 | ); |
100 | 77 | |
101 | | -protected $m_NamespaceAliases = array( |
102 | | - // support English aliases for namespaces |
103 | | - 'Property' => SMW_NS_PROPERTY, |
104 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
105 | | - 'Type' => SMW_NS_TYPE, |
106 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
107 | | - 'Concept' => SMW_NS_CONCEPT, |
108 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
109 | | -); |
110 | | - |
111 | 78 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_DMY,SMW_MDY,SMW_YMD,SMW_YDM)); |
112 | 79 | |
113 | 80 | protected $m_months = array("января","февраля","марта","апреля", "мая","июня","июля","августа","сентрября", "октября","ноября","декабря"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageDe.php |
— | — | @@ -50,18 +50,6 @@ |
51 | 51 | 'Ganze Zahl' => '_num', |
52 | 52 | 'Dezimalzahl' => '_num', |
53 | 53 | 'Aufzählung' => '_str', |
54 | | - // support English aliases: |
55 | | - 'Page' => '_wpg', |
56 | | - 'String' => '_str', |
57 | | - 'Text' => '_txt', |
58 | | - 'Code' => '_cod', |
59 | | - 'Boolean' => '_boo', |
60 | | - 'Number' => '_num', |
61 | | - 'Geographic coordinate' => '_geo', |
62 | | - 'Temperature' => '_tem', |
63 | | - 'Date' => '_dat', |
64 | | - 'Email' => '_ema', |
65 | | - 'Annotation URI' => '_anu' |
66 | 54 | ); |
67 | 55 | |
68 | 56 | protected $m_SpecialProperties = array( |
— | — | @@ -80,18 +68,7 @@ |
81 | 69 | |
82 | 70 | protected $m_SpecialPropertyAliases = array( |
83 | 71 | 'Hat Datentyp' => '_TYPE', |
84 | | - 'Ausgabeeinheit' => '_UNIT', |
85 | | - // support English aliases for special properties |
86 | | - 'Has type' => '_TYPE', |
87 | | - 'Equivalent URI' => '_URI', |
88 | | - 'Subproperty of' => '_SUBP', |
89 | | - 'Display units' => '_UNIT', |
90 | | - 'Imported from' => '_IMPO', |
91 | | - 'Corresponds to' => '_CONV', |
92 | | - 'Provides service' => '_SERV', |
93 | | - 'Allows value' => '_PVAL', |
94 | | - 'Modification date' => '_MDAT', |
95 | | - 'Has improper value for' => '_ERRP' |
| 72 | + 'Ausgabeeinheit' => '_UNIT' |
96 | 73 | ); |
97 | 74 | |
98 | 75 | protected $m_Namespaces = array( |
— | — | @@ -103,16 +80,6 @@ |
104 | 81 | SMW_NS_CONCEPT_TALK => 'Konzept_Diskussion' |
105 | 82 | ); |
106 | 83 | |
107 | | -protected $m_NamespaceAliases = array( |
108 | | - // support English aliases for namespaces |
109 | | - 'Property' => SMW_NS_PROPERTY, |
110 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
111 | | - 'Type' => SMW_NS_TYPE, |
112 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
113 | | - 'Concept' => SMW_NS_CONCEPT, |
114 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
115 | | -); |
116 | | - |
117 | 84 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_DMY,SMW_MDY,SMW_YMD,SMW_YDM)); |
118 | 85 | |
119 | 86 | protected $m_months = array("Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageZh_tw.php |
— | — | @@ -46,17 +46,6 @@ |
47 | 47 | 'Integer' => '_num', |
48 | 48 | 'Enumeration' => '_str', |
49 | 49 | 'URI' => '_uri', |
50 | | - // support English aliases: |
51 | | - 'Page' => '_wpg', |
52 | | - 'String' => '_str', |
53 | | - 'Text' => '_txt', |
54 | | - 'Boolean' => '_boo', |
55 | | - 'Number' => '_num', |
56 | | - 'Geographic coordinate' => '_geo', |
57 | | - 'Temperature' => '_tem', |
58 | | - 'Date' => '_dat', |
59 | | - 'Email' => '_ema', |
60 | | - 'Annotation URI' => '_anu' |
61 | 50 | ); |
62 | 51 | |
63 | 52 | protected $m_SpecialProperties = array( |
— | — | @@ -75,18 +64,7 @@ |
76 | 65 | |
77 | 66 | |
78 | 67 | protected $m_SpecialPropertyAliases = array( |
79 | | - 'Display unit' => '_UNIT', |
80 | | -// support English aliases for special properties |
81 | | - 'Has type' => '_TYPE', |
82 | | - 'Equivalent URI' => '_URI', |
83 | | - 'Subproperty of' => '_SUBP', |
84 | | - 'Display units' => '_UNIT', |
85 | | - 'Imported from' => '_IMPO', |
86 | | - 'Corresponds to' => '_CONV', |
87 | | - 'Provides service' => '_SERV', |
88 | | - 'Allows value' => '_PVAL', |
89 | | - 'Modification date' => '_MDAT', |
90 | | - 'Has improper value for' => '_ERRP' |
| 68 | + 'Display unit' => '_UNIT' |
91 | 69 | ); |
92 | 70 | |
93 | 71 | protected $m_Namespaces = array( |
— | — | @@ -98,16 +76,6 @@ |
99 | 77 | SMW_NS_CONCEPT_TALK => '概念討論', //'Concept_talk' |
100 | 78 | ); |
101 | 79 | |
102 | | -protected $m_NamespaceAliases = array( |
103 | | - // support English aliases for namespaces |
104 | | - 'Property' => SMW_NS_PROPERTY, |
105 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
106 | | - 'Type' => SMW_NS_TYPE, |
107 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
108 | | - 'Concept' => SMW_NS_CONCEPT, |
109 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
110 | | -); |
111 | | - |
112 | 80 | protected $m_dateformats = array(array(SMW_Y), array(SMW_MY,SMW_YM), array(SMW_MDY,SMW_DMY,SMW_YMD,SMW_YDM)); |
113 | 81 | |
114 | 82 | protected $m_months = array("1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"); |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageHe.php |
— | — | @@ -44,18 +44,6 @@ |
45 | 45 | => '_num', |
46 | 46 | 'נקודהצפה' |
47 | 47 | => '_num', |
48 | | - // support English aliases: |
49 | | - 'Page' => '_wpg', |
50 | | - 'String' => '_str', |
51 | | - 'Text' => '_txt', |
52 | | - 'Boolean' => '_boo', |
53 | | - 'Number' => '_num', |
54 | | - 'Geographic coordinate' => '_geo', |
55 | | - 'Temperature' => '_tem', |
56 | | - 'Date' => '_dat', |
57 | | - 'Email' => '_ema', |
58 | | - 'URI' => '_uri', |
59 | | - 'Annotation URI' => '_anu' |
60 | 48 | ); |
61 | 49 | |
62 | 50 | protected $m_SpecialProperties = array( |
— | — | @@ -75,17 +63,6 @@ |
76 | 64 | protected $m_SpecialPropertyAliases = array( |
77 | 65 | 'יחידת הצגה' |
78 | 66 | => '_UNIT', |
79 | | - // support English aliases for special properties |
80 | | - 'Has type' => '_TYPE', |
81 | | - 'Equivalent URI' => '_URI', |
82 | | - 'Subproperty of' => '_SUBP', |
83 | | - 'Display units' => '_UNIT', |
84 | | - 'Imported from' => '_IMPO', |
85 | | - 'Corresponds to' => '_CONV', |
86 | | - 'Provides service' => '_SERV', |
87 | | - 'Allows value' => '_PVAL', |
88 | | - 'Modification date' => '_MDAT', |
89 | | - 'Has improper value for' => '_ERRP' |
90 | 67 | ); |
91 | 68 | |
92 | 69 | |
— | — | @@ -99,14 +76,4 @@ |
100 | 77 | ); |
101 | 78 | |
102 | 79 | |
103 | | -protected $m_NamespaceAliases = array( |
104 | | - // support English aliases for namespaces |
105 | | - 'Property' => SMW_NS_PROPERTY, |
106 | | - 'Property_talk' => SMW_NS_PROPERTY_TALK, |
107 | | - 'Type' => SMW_NS_TYPE, |
108 | | - 'Type_talk' => SMW_NS_TYPE_TALK, |
109 | | - 'Concept' => SMW_NS_CONCEPT, |
110 | | - 'Concept_talk' => SMW_NS_CONCEPT_TALK |
111 | | -); |
112 | | - |
113 | 80 | } |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageArz.php |
— | — | @@ -59,8 +59,6 @@ |
60 | 60 | ); |
61 | 61 | |
62 | 62 | protected $m_SpecialPropertyAliases = array( |
63 | | - 'Modification date' => '_MDAT', |
64 | | - 'Has improper value for' => '_ERRP', |
65 | 63 | 'عرض الوحدة' => '_UNIT' |
66 | 64 | ); |
67 | 65 | |