r19804 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r19803‎ | r19804 | r19805 >
Date:15:32, 6 February 2007
Author:proes
Status:old
Tags:
Comment:
Finished moving attribute names to WikiDataGlobals.php.
Modified paths:
  • /trunk/extensions/Wikidata/OmegaWiki/OmegaWikiAttributes.php (modified) (history)
  • /trunk/extensions/Wikidata/OmegaWiki/OmegaWikiEditors.php (modified) (history)
  • /trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php (modified) (history)
  • /trunk/extensions/Wikidata/OmegaWiki/WikiDataGlobals.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Wikidata/OmegaWiki/WikiDataGlobals.php
——@@ -6,21 +6,44 @@
77 $wgAnnotationAttributeName,
88 $wgApproximateMeaningsAttributeName,
99 $wgAuthorityAttributeName,
 10+ $wgClassAttributeAttributeAttributeName,
 11+ $wgClassAttributesAttributeName,
 12+ $wgClassAttributeLevelAttributeName,
 13+ $wgClassAttributeTypeAttributeName,
1014 $wgClassMembershipAttributeName,
 15+ $wgCollectionAttributeName,
 16+ $wgCollectionMembershipAttributeName,
 17+ $wgDefinedMeaningAttributesAttributeName,
 18+ $wgDefinedMeaningAttributeName,
 19+ $wgDefinedMeaningReferenceAttributeName,
1120 $wgDefinitionAttributeName,
 21+ $wgLanguageAttributeName,
1222 $wgExactMeaningsAttributeName,
 23+ $wgExpressionAttributeName,
 24+ $wgExpressionMeaningsAttributeName,
 25+ $wgExpressionsAttributeName,
 26+ $wgIdenticalMeaningAttributeName,
1327 $wgIncomingRelationsAttributeName,
1428 $wgLevelAnnotationAttributeName,
1529 $wgOptionAttributeOptionAttributeName,
 30+ $wgOptionAttributeOptionsAttributeName,
1631 $wgOptionAttributeValuesAttributeName,
17 - $wgOtherDefinedMeaningAttributeName,
 32+ $wgOtherDefinedMeaningAttributeName,
 33+ $wgPopupAnnotationName,
 34+ $wgPossibleSynonymAttributeName,
1835 $wgPossiblySynonymousAttributeName,
1936 $wgRelationsAttributeName,
2037 $wgRelationTypeAttributeName,
2138 $wgSourceAttributeName,
 39+ $wgSourceIdentifierAttributeName,
 40+ $wgSpellingAttributeName,
 41+ $wgSynonymsAttributeName,
 42+ $wgSynonymsAndTranslationsAttributeName,
2243 $wgTextAttributeAttributeName,
 44+ $wgTextAttributeName,
2345 $wgTextAttributeValuesAttributeName,
2446 $wgTranslatedTextAttributeAttributeName,
 47+ $wgTranslatedTextAttributeName,
2548 $wgTranslatedTextAttributeValueAttributeName,
2649 $wgTranslatedTextAttributeValuesAttributeName,
2750 $wgUrlAttributeAttributeName,
——@@ -31,22 +54,45 @@
3255 $wgAnnotationAttributeName = "Annotation";
3356 $wgApproximateMeaningsAttributeName = "Approximate meanings";
3457 $wgAuthorityAttributeName = "Authority";
 58+$wgClassAttributeAttributeAttributeName = "Attribute";
 59+$wgClassAttributesAttributeName = "Class attributes";
 60+$wgClassAttributeLevelAttributeName = "Level";
 61+$wgClassAttributeTypeAttributeName = "Type";
3562 $wgClassMembershipAttributeName = "Class membership";
 63+$wgCollectionAttributeName = "Collection";
 64+$wgCollectionMembershipAttributeName = "Collection membership";
3665 $wgDefinitionAttributeName = "Definition";
 66+$wgDefinedMeaningAttributesAttributeName = "Annotation";
 67+$wgDefinedMeaningAttributeName = "Defined meaning";
 68+$wgDefinedMeaningReferenceAttributeName = "Defined meaning";
3769 $wgExactMeaningsAttributeName = "Exact meanings";
 70+$wgExpressionAttributeName = "Expression";
 71+$wgExpressionMeaningsAttributeName = "Expression meanings";
 72+$wgExpressionsAttributeName = "Expressions";
 73+$wgIdenticalMeaningAttributeName = "Identical meaning?";
3874 $wgIncomingRelationsAttributeName = "Incoming relations";
 75+$wgLanguageAttributeName = "Language";
3976 $wgLevelAnnotationAttributeName = "Annotation";
4077 $wgOptionAttributeAttributeName = "Property";
4178 $wgOptionAttributeOptionAttributeName = "Option";
 79+$wgOptionAttributeOptionsAttributeName = "Options";
4280 $wgOptionAttributeValuesAttributeName = "Option properties";
4381 $wgOtherDefinedMeaningAttributeName = "Other defined meaning";
 82+$wgPopupAnnotationName = "Annotation";
 83+$wgPossibleSynonymAttributeName = "Possible synonym";
4484 $wgPossiblySynonymousAttributeName = "Possibly synonymous";
4585 $wgRelationsAttributeName = "Relations";
46 -$wgRelationTypeAttributeName = "Relation type";
47 -$wgTranslatedTextAttributeAttributeName = "Property";
 86+$wgRelationTypeAttributeName = "Relation type";
 87+$wgSpellingAttributeName = "Spelling";
 88+$wgSynonymsAttributeName = "Synonyms";
 89+$wgSynonymsAndTranslationsAttributeName = "Synonyms and translations";
4890 $wgSourceAttributeName = "Source";
 91+$wgSourceIdentifierAttributeName = "Source identifier";
4992 $wgTextAttributeAttributeName = "Property";
 93+$wgTextAttributeName = "Text";
5094 $wgTextAttributeValuesAttributeName = "String properties";
 95+$wgTranslatedTextAttributeAttributeName = "Property";
 96+$wgTranslatedTextAttributeName = "Translated text";
5197 $wgTranslatedTextAttributeValueAttributeName = "Text";
5298 $wgTranslatedTextAttributeValuesAttributeName = "Text properties";
5399 $wgUrlAttributeAttributeName = "Property";
Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiAttributes.php
——@@ -5,26 +5,34 @@
66
77 function initializeOmegaWikiAttributes($filterOnLanguage, $hasMetaDataAttributes) {
88 global
9 - $languageAttribute, $spellingAttribute, $textAttribute;
 9+ $languageAttribute, $spellingAttribute, $textAttribute,
 10+ $wgLanguageAttributeName, $wgSpellingAttributeName, $wgTextAttributeName;
1011
11 - $languageAttribute = new Attribute("language", "Language", "language");
12 - $spellingAttribute = new Attribute("spelling", "Spelling", "spelling");
13 - $textAttribute = new Attribute("text", "Text", "text");
 12+ $languageAttribute = new Attribute("language", $wgLanguageAttributeName, "language");
 13+ $spellingAttribute = new Attribute("spelling", $wgSpellingAttributeName, "spelling");
 14+ $textAttribute = new Attribute("text", $wgTextAttributeName, "text");
1415
1516 global
16 - $expressionIdAttribute, $identicalMeaningAttribute;
 17+ $objectAttributesAttribute, $definedMeaningAttributesAttribute,
 18+ $wgDefinedMeaningAttributesAttributeName, $wgAnnotationAttributeName;
1719
 20+ $definedMeaningAttributesAttribute = new Attribute("defined-meaning-attributes", $wgDefinedMeaningAttributesAttributeName, "will-be-specified-below");
 21+ $objectAttributesAttribute = new Attribute("object-attributes", $wgAnnotationAttributeName, "will-be-specified-below");
 22+
 23+ global
 24+ $expressionIdAttribute, $identicalMeaningAttribute, $wgIdenticalMeaningAttributeName;
 25+
1826 $expressionIdAttribute = new Attribute("expression-id", "Expression Id", "expression-id");
19 - $identicalMeaningAttribute = new Attribute("indentical-meaning", "Identical meaning?", "boolean");
 27+ $identicalMeaningAttribute = new Attribute("indentical-meaning", $wgIdenticalMeaningAttributeName, "boolean");
2028
2129 global
22 - $expressionStructure, $expressionAttribute;
 30+ $expressionStructure, $expressionAttribute, $wgExpressionAttributeName;
2331
2432 if ($filterOnLanguage)
25 - $expressionAttribute = new Attribute("expression", "Spelling", "spelling");
 33+ $expressionAttribute = new Attribute("expression", $wgSpellingAttributeName, "spelling");
2634 else {
2735 $expressionStructure = new Structure($languageAttribute, $spellingAttribute);
28 - $expressionAttribute = new Attribute("expression", "Expression", new RecordType($expressionStructure));
 36+ $expressionAttribute = new Attribute("expression", $wgExpressionAttributeName, new RecordType($expressionStructure));
2937 }
3038
3139 global
——@@ -35,26 +43,27 @@
3644
3745 global
3846 $definedMeaningReferenceStructure, $definedMeaningLabelAttribute, $definedMeaningReferenceKeyStructure, $definedMeaningReferenceType,
39 - $definedMeaningReferenceAttribute;
 47+ $definedMeaningReferenceAttribute, $wgDefinedMeaningReferenceAttributeName;
4048
4149 $definedMeaningLabelAttribute = new Attribute("defined-meaning-label", "Defined meaning label", "short-text");
4250 $definedMeaningReferenceStructure = new Structure($definedMeaningIdAttribute, $definedMeaningLabelAttribute, $definedMeaningDefiningExpressionAttribute);
4351 $definedMeaningReferenceKeyStructure = new Structure($definedMeaningIdAttribute);
4452 $definedMeaningReferenceType = new RecordType($definedMeaningReferenceStructure);
45 - $definedMeaningReferenceAttribute = new Attribute("defined-meaning", "Defined meaning", $definedMeaningReferenceType);
 53+ $definedMeaningReferenceAttribute = new Attribute("defined-meaning", $wgDefinedMeaningReferenceAttributeName, $definedMeaningReferenceType);
4654
4755 global
48 - $collectionIdAttribute, $collectionMeaningType, $collectionMeaningAttribute, $sourceIdentifierAttribute;
 56+ $collectionIdAttribute, $collectionMeaningType, $collectionMeaningAttribute, $sourceIdentifierAttribute,
 57+ $wgCollectionAttributeName, $wgSourceIdentifierAttributeName;
4958
5059 $collectionIdAttribute = new Attribute("collection", "Collection", "collection-id");
5160 $collectionMeaningType = new RecordType($definedMeaningReferenceStructure);
52 - $collectionMeaningAttribute = new Attribute("collection-meaning", "Collection", $collectionMeaningType);
53 - $sourceIdentifierAttribute = new Attribute("source-identifier", "Source identifier", "short-text");
 61+ $collectionMeaningAttribute = new Attribute("collection-meaning", $wgCollectionAttributeName, $collectionMeaningType);
 62+ $sourceIdentifierAttribute = new Attribute("source-identifier", $wgSourceIdentifierAttributeName, "short-text");
5463
5564 global
56 - $collectionMembershipAttribute;
 65+ $collectionMembershipAttribute, $wgCollectionMembershipAttributeName;
5766
58 - $collectionMembershipAttribute = new Attribute("collection-membership", "Collection membership", new RecordSetType(new Structure($collectionIdAttribute, $collectionMeaningAttribute, $sourceIdentifierAttribute)));
 67+ $collectionMembershipAttribute = new Attribute("collection-membership", $wgCollectionMembershipAttributeName, new RecordSetType(new Structure($collectionIdAttribute, $collectionMeaningAttribute, $sourceIdentifierAttribute)));
5968
6069 global
6170 $classMembershipIdAttribute, $classAttribute;
——@@ -70,10 +79,10 @@
7180 $classMembershipAttribute = new Attribute("class-membership", $wgClassMembershipAttributeName, new RecordSetType($classMembershipStructure));
7281
7382 global
74 - $possiblySynonymousIdAttribute, $possibleSynonymAttribute;
 83+ $possiblySynonymousIdAttribute, $possibleSynonymAttribute, $wgPossibleSynonymAttributeName;
7584
7685 $possiblySynonymousIdAttribute = new Attribute("possibly-synonymous-id", "Possibly synonymous id", "integer");
77 - $possibleSynonymAttribute = new Attribute("possible-synonym", "Possible synonym", new RecordType($definedMeaningReferenceStructure));
 86+ $possibleSynonymAttribute = new Attribute("possible-synonym", $wgPossibleSynonymAttributeName, new RecordType($definedMeaningReferenceStructure));
7887
7988 global
8089 $possiblySynonymousStructure, $possiblySynonymousKeyStructure, $possiblySynonymousAttribute,
——@@ -126,12 +135,13 @@
127136 $alternativeDefinitionsAttribute = new Attribute("alternative-definitions", $wgAlternativeDefinitionsAttributeName, new RecordSetType(new Structure($definitionIdAttribute, $alternativeDefinitionAttribute, $sourceAttribute)));
128137
129138 global
130 - $synonymsAndTranslationsAttribute, $syntransIdAttribute;
 139+ $synonymsAndTranslationsAttribute, $syntransIdAttribute,
 140+ $wgSynonymsAttributeName, $wgSynonymsAndTranslationsAttributeName;
131141
132142 if ($filterOnLanguage)
133 - $synonymsAndTranslationsCaption = "Synonyms";
 143+ $synonymsAndTranslationsCaption = $wgSynonymsAttributeName;
134144 else
135 - $synonymsAndTranslationsCaption = "Synonyms and translations";
 145+ $synonymsAndTranslationsCaption = $wgSynonymsAndTranslationsAttributeName;
136146
137147 $syntransIdAttribute = new Attribute("syntrans-id", "$synonymsAndTranslationsCaption identifier", "integer");
138148 $synonymsAndTranslationsAttribute = new Attribute("synonyms-translations", "$synonymsAndTranslationsCaption", new RecordSetType(new Structure($syntransIdAttribute, $expressionAttribute, $identicalMeaningAttribute, $objectAttributesAttribute)));
——@@ -185,23 +195,23 @@
186196 $optionAttributeValuesAttribute = new Attribute('option-attribute-values', $wgOptionAttributeValuesAttributeName, new RecordSetType($optionAttributeValuesStructure));
187197
188198 global
189 - $optionAttributeOptionIdAttribute, $optionAttributeOptionsAttribute;
 199+ $optionAttributeOptionIdAttribute, $optionAttributeOptionsAttribute, $wgOptionAttributeOptionsAttributeName;
190200
191201 $optionAttributeOptionIdAttribute = new Attribute('option-attribute-option-id', 'Option identifier', 'object-id');
192202 $optionAttributeOptionsStructure = new Structure($optionAttributeOptionIdAttribute, $optionAttributeAttribute, $optionAttributeOptionAttribute, $languageAttribute);
193 - $optionAttributeOptionsAttribute = new Attribute('option-attribute-options', 'Options', new RecordSetType($optionAttributeOptionsStructure));
 203+ $optionAttributeOptionsAttribute = new Attribute('option-attribute-options', $wgOptionAttributeOptionsAttributeName, new RecordSetType($optionAttributeOptionsStructure));
194204
195205 global
196206 $definitionAttribute, $definedMeaningAttribute, $translatedTextAttribute, $classAttributesAttribute,
197 - $wgDefinitionAttributeName;
 207+ $wgDefinitionAttributeName, $wgDefinedMeaningAttributeName, $wgTranslatedTextAttributeName;
198208
199209 if ($filterOnLanguage && !$hasMetaDataAttributes)
200 - $translatedTextAttribute = new Attribute("translated-text", "Text", "text");
 210+ $translatedTextAttribute = new Attribute("translated-text", $wgTextAttributeName, "text");
201211 else
202 - $translatedTextAttribute = new Attribute("translated-text", "Translated text", new RecordSetType($translatedTextStructure));
 212+ $translatedTextAttribute = new Attribute("translated-text", $wgTranslatedTextAttributeName, new RecordSetType($translatedTextStructure));
203213
204214 $definitionAttribute = new Attribute("definition", $wgDefinitionAttributeName, new RecordType(new Structure($translatedTextAttribute, $objectAttributesAttribute)));
205 - $definedMeaningAttribute = new Attribute("defined-meaning", "Defined meaning", new RecordType(new Structure($definitionAttribute, $classAttributesAttribute, $alternativeDefinitionsAttribute, $synonymsAndTranslationsAttribute, $relationsAttribute, $classMembershipAttribute, $collectionMembershipAttribute, $objectAttributesAttribute)));
 215+ $definedMeaningAttribute = new Attribute("defined-meaning", $wgDefinedMeaningAttributeName, new RecordType(new Structure($definitionAttribute, $classAttributesAttribute, $alternativeDefinitionsAttribute, $synonymsAndTranslationsAttribute, $relationsAttribute, $classMembershipAttribute, $collectionMembershipAttribute, $objectAttributesAttribute)));
206216
207217 global
208218 $expressionsAttribute, $expressionMeaningStructure, $expressionExactMeaningsAttribute, $expressionApproximateMeaningsAttribute,
——@@ -212,32 +222,35 @@
213223 $expressionApproximateMeaningsAttribute = new Attribute("expression-approximate-meanings", $wgApproximateMeaningsAttributeName, new RecordSetType($expressionMeaningStructure));
214224
215225 global
216 - $expressionMeaningsAttribute, $expressionMeaningsStructure, $expressionApproximateMeaningAttribute;
 226+ $expressionMeaningsAttribute, $expressionMeaningsStructure, $expressionApproximateMeaningAttribute,
 227+ $wgExpressionMeaningsAttributeName, $wgExpressionsAttributeName;
217228
218229 $expressionMeaningsStructure = new Structure($expressionExactMeaningsAttribute, $expressionApproximateMeaningAttribute);
219 - $expressionMeaningsAttribute = new Attribute("expression-meanings", "Expression meanings", new RecordType($expressionMeaningsStructure));
 230+ $expressionMeaningsAttribute = new Attribute("expression-meanings", $wgExpressionMeaningsAttributeName, new RecordType($expressionMeaningsStructure));
220231
221 - $expressionsAttribute = new Attribute("expressions", "Expressions", new RecordSetType(new Structure($expressionIdAttribute, $expressionAttribute, $expressionMeaningsAttribute)));
 232+ $expressionsAttribute = new Attribute("expressions", $wgExpressionsAttributeName, new RecordSetType(new Structure($expressionIdAttribute, $expressionAttribute, $expressionMeaningsAttribute)));
222233
223234 global
224235 $objectIdAttribute, $objectAttributesStructure, $wgAnnotationAttributeName;
225236
226237 $objectIdAttribute = new Attribute("object-id", "Object identifier", "object-id");
227238 $objectAttributesStructure = new Structure($objectIdAttribute, $textAttributeValuesAttribute, $translatedTextAttributeValuesAttribute, $optionAttributeValuesAttribute);
228 - $objectAttributesAttribute = new Attribute("object-attributes", $wgAnnotationAttributeName, new RecordType($objectAttributesStructure));
 239+ $objectAttributesAttribute->type = new RecordType($objectAttributesStructure);
 240+ $definedMeaningAttributesAttribute->type = new RecordType($objectAttributesStructure);
229241
230242 global
231243 $classAttributesStructure,
232244 // $classAttributeClassAttribute,
233 - $classAttributeIdAttribute, $classAttributeAttributeAttribute, $classAttributeLevelAttribute, $classAttributeTypeAttribute;
 245+ $classAttributeIdAttribute, $classAttributeAttributeAttribute, $classAttributeLevelAttribute, $classAttributeTypeAttribute,
 246+ $wgClassAttributeAttributeAttributeName, $wgClassAttributeLevelAttributeName,
 247+ $wgClassAttributeTypeAttributeName, $wgClassAttributesAttributeName;
234248
235249 $classAttributeIdAttribute = new Attribute("class-attribute-id", "Class attribute identifier", "object-id");
236 - //$classAttributeClassAttribute = new Attribute("class-attribute-class", "Class", "defined-meaning-id");
237 - $classAttributeAttributeAttribute = new Attribute("class-attribute-attribute", "Attribute", new RecordType($definedMeaningReferenceStructure));
238 - $classAttributeLevelAttribute = new Attribute("class-attribute-level", "Level", new RecordType($definedMeaningReferenceStructure));
239 - $classAttributeTypeAttribute = new Attribute("class-attribute-type", "Type", "short-text");
 250+ $classAttributeAttributeAttribute = new Attribute("class-attribute-attribute", $wgClassAttributeAttributeAttributeName, new RecordType($definedMeaningReferenceStructure));
 251+ $classAttributeLevelAttribute = new Attribute("class-attribute-level", $wgClassAttributeLevelAttributeName, new RecordType($definedMeaningReferenceStructure));
 252+ $classAttributeTypeAttribute = new Attribute("class-attribute-type", $wgClassAttributeTypeAttributeName, "short-text");
240253 $classAttributesStructure = new Structure($classAttributeIdAttribute, $classAttributeAttributeAttribute, $classAttributeLevelAttribute, $classAttributeTypeAttribute, $optionAttributeOptionsAttribute);
241 - $classAttributesAttribute = new Attribute("class-attributes", "Class attributes", new RecordSetType($classAttributesStructure));
 254+ $classAttributesAttribute = new Attribute("class-attributes", $wgClassAttributesAttributeName, new RecordSetType($classAttributesStructure));
242255 }
243256
244257 ?>
Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiEditors.php
——@@ -7,7 +7,7 @@
88
99 function initializeObjectAttributeEditors($filterLanguageId, $showRecordLifeSpan, $showAuthority) {
1010 global
11 - $objectAttributesAttribute,
 11+ $objectAttributesAttribute, $definedMeaningAttributesAttribute,
1212 $definedMeaningObjectAttributesEditor, $definedMeaningIdAttribute,
1313 $definitionObjectAttributesEditor, $definedMeaningIdAttribute,
1414 $synonymsAndTranslationsObjectAttributesEditor, $syntransIdAttribute,
——@@ -21,7 +21,7 @@
2222 $relationMeaningName, $synTransMeaningName,
2323 $annotationMeaningName;
2424
25 - $definedMeaningObjectAttributesEditor = new RecordUnorderedListEditor($objectAttributesAttribute, 5);
 25+ $definedMeaningObjectAttributesEditor = new RecordUnorderedListEditor($definedMeaningAttributesAttribute, 5);
2626 $definitionObjectAttributesEditor = new RecordUnorderedListEditor($objectAttributesAttribute, 5);
2727 $synonymsAndTranslationsObjectAttributesEditor = new RecordUnorderedListEditor($objectAttributesAttribute, 5);
2828 $possiblySynonymousObjectAttributesEditor = new RecordUnorderedListEditor($objectAttributesAttribute, 5);
——@@ -87,7 +87,7 @@
8888
8989 function getDefinitionEditor($filterLanguageId, $showRecordLifeSpan, $showAuthority) {
9090 global
91 - $definitionAttribute, $translatedTextAttribute, $definitionObjectAttributesEditor;
 91+ $definitionAttribute, $translatedTextAttribute, $definitionObjectAttributesEditor, $wgPopupAnnotationName;
9292
9393 if ($filterLanguageId == 0)
9494 $controller = new DefinedMeaningDefinitionController();
——@@ -96,7 +96,7 @@
9797
9898 $editor = new RecordDivListEditor($definitionAttribute);
9999 $editor->addEditor(getTranslatedTextEditor($translatedTextAttribute, $controller, $filterLanguageId, $showRecordLifeSpan, $showAuthority));
100 - $editor->addEditor(new PopUpEditor($definitionObjectAttributesEditor, 'Annotation'));
 100+ $editor->addEditor(new PopUpEditor($definitionObjectAttributesEditor, $wgPopupAnnotationName));
101101
102102 return $editor;
103103 }
——@@ -178,12 +178,12 @@
179179 function getSynonymsAndTranslationsEditor($filterLanguageId, $showRecordLifeSpan, $showAuthority) {
180180 global
181181 $synonymsAndTranslationsAttribute, $identicalMeaningAttribute, $expressionIdAttribute,
182 - $expressionAttribute, $synonymsAndTranslationsObjectAttributesEditor;
 182+ $expressionAttribute, $synonymsAndTranslationsObjectAttributesEditor, $wgPopupAnnotationName;
183183
184184 $tableEditor = new RecordSetTableEditor($synonymsAndTranslationsAttribute, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, new SynonymTranslationController($filterLanguageId));
185185 $tableEditor->addEditor(getExpressionTableCellEditor($expressionAttribute, $filterLanguageId));
186186 $tableEditor->addEditor(new BooleanEditor($identicalMeaningAttribute, new SimplePermissionController(true), true, true));
187 - $tableEditor->addEditor(new PopUpEditor($synonymsAndTranslationsObjectAttributesEditor, 'Annotation'));
 187+ $tableEditor->addEditor(new PopUpEditor($synonymsAndTranslationsObjectAttributesEditor, $wgPopupAnnotationName));
188188
189189 addTableMetadataEditors($tableEditor, $showRecordLifeSpan, $showAuthority);
190190
——@@ -193,12 +193,12 @@
194194 function getDefinedMeaningRelationsEditor($showRecordLifeSpan, $showAuthority) {
195195 global
196196 $relationsAttribute, $relationTypeAttribute, $otherDefinedMeaningAttribute,
197 - $relationsObjectAttributesEditor;
 197+ $relationsObjectAttributesEditor, $wgPopupAnnotationName;
198198
199199 $editor = new RecordSetTableEditor($relationsAttribute, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, new DefinedMeaningRelationController());
200200 $editor->addEditor(new RelationTypeReferenceEditor($relationTypeAttribute, new SimplePermissionController(false), true));
201201 $editor->addEditor(new DefinedMeaningReferenceEditor($otherDefinedMeaningAttribute, new SimplePermissionController(false), true));
202 - $editor->addEditor(new PopUpEditor($relationsObjectAttributesEditor, 'Annotation'));
 202+ $editor->addEditor(new PopUpEditor($relationsObjectAttributesEditor, $wgPopupAnnotationName));
203203
204204 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
205205
——@@ -208,12 +208,12 @@
209209 function getDefinedMeaningReciprocalRelationsEditor($showRecordLifeSpan, $showAuthority) {
210210 global
211211 $reciprocalRelationsAttribute, $relationTypeAttribute, $otherDefinedMeaningAttribute,
212 - $relationsObjectAttributesEditor;
 212+ $relationsObjectAttributesEditor, $wgPopupAnnotationName;
213213
214214 $editor = new RecordSetTableEditor($reciprocalRelationsAttribute, new SimplePermissionController(false), new ShowEditFieldChecker(true), new AllowAddController(false), false, false, null);
215215 $editor->addEditor(new DefinedMeaningReferenceEditor($otherDefinedMeaningAttribute, new SimplePermissionController(false), true));
216216 $editor->addEditor(new RelationTypeReferenceEditor($relationTypeAttribute, new SimplePermissionController(false), true));
217 - $editor->addEditor(new PopUpEditor($relationsObjectAttributesEditor, 'Annotation'));
 217+ $editor->addEditor(new PopUpEditor($relationsObjectAttributesEditor, $wgPopupAnnotationName));
218218
219219 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
220220
——@@ -233,6 +233,9 @@
234234 }
235235
236236 function getGroupedRelationTypeEditor($groupedRelationsAttribute, $groupedRelationIdAttribute, $otherDefinedMeaningAttribute, $relationTypeId, $showRecordLifeSpan, $showAuthority, $objectAttributesEditor) {
 237+ global
 238+ $wgPopupAnnotationName;
 239+
237240 $editor = new RecordSetTableEditor(
238241 $groupedRelationsAttribute,
239242 new SimplePermissionController(true),
——@@ -246,7 +249,7 @@
247250 $editor->addEditor(new DefinedMeaningReferenceEditor($otherDefinedMeaningAttribute, new SimplePermissionController(false), true));
248251
249252 if ($objectAttributesEditor != null)
250 - $editor->addEditor(new PopUpEditor($objectAttributesEditor, 'Annotation'));
 253+ $editor->addEditor(new PopUpEditor($objectAttributesEditor, $wgPopupAnnotationName));
251254
252255 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
253256
——@@ -268,12 +271,13 @@
269272
270273 function getTextAttributeValuesEditor($showRecordLifeSpan, $showAuthority, $controller, $levelDefinedMeaningName, $objectIdFetcher) {
271274 global
272 - $textAttributeAttribute, $textAttribute, $textAttributeValuesAttribute, $textValueObjectAttributesEditor;
 275+ $textAttributeAttribute, $textAttribute, $textAttributeValuesAttribute, $textValueObjectAttributesEditor,
 276+ $wgPopupAnnotationName;
273277
274278 $editor = new RecordSetTableEditor($textAttributeValuesAttribute, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, $controller);
275279 $editor->addEditor(new TextAttributeEditor($textAttributeAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName, $objectIdFetcher));
276280 $editor->addEditor(new TextEditor($textAttribute, new SimplePermissionController(true), true));
277 - $editor->addEditor(new PopUpEditor($textValueObjectAttributesEditor, 'Annotation'));
 281+ $editor->addEditor(new PopUpEditor($textValueObjectAttributesEditor, $wgPopupAnnotationName));
278282
279283 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
280284
——@@ -282,12 +286,13 @@
283287
284288 function getURLAttributeValuesEditor($showRecordLifeSpan, $showAuthority, $controller, $levelDefinedMeaningName, $objectIdFetcher) {
285289 global
286 - $urlAttributeAttribute, $urlAttribute, $urlAttributeValuesAttribute, $urlValueObjectAttributesEditor;
 290+ $urlAttributeAttribute, $urlAttribute, $urlAttributeValuesAttribute, $urlValueObjectAttributesEditor,
 291+ $wgPopupAnnotationName;
287292
288293 $editor = new RecordSetTableEditor($urlAttributeValuesAttribute, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, $controller);
289294 $editor->addEditor(new TextAttributeEditor($urlAttributeAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName, $objectIdFetcher));
290295 $editor->addEditor(new URLEditor($urlAttribute, new SimplePermissionController(true), true));
291 - $editor->addEditor(new PopUpEditor($urlValueObjectAttributesEditor, 'Annotation'));
 296+ $editor->addEditor(new PopUpEditor($urlValueObjectAttributesEditor, $wgPopupAnnotationName));
292297
293298 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
294299
——@@ -296,7 +301,8 @@
297302
298303 function getTranslatedTextAttributeValuesEditor($filterLanguageId, $showRecordLifeSpan, $showAuthority, $controller, $levelDefinedMeaningName, $objectIdFetcher) {
299304 global
300 - $translatedTextAttributeAttribute, $translatedTextValueAttribute, $translatedTextAttributeValuesAttribute, $translatedTextValueObjectAttributesEditor;
 305+ $translatedTextAttributeAttribute, $translatedTextValueAttribute, $translatedTextAttributeValuesAttribute,
 306+ $translatedTextValueObjectAttributesEditor, $wgPopupAnnotationName;
301307
302308 if ($filterLanguageId == 0)
303309 $translatedTextAttributeValueController = new TranslatedTextAttributeValueController();
——@@ -306,7 +312,7 @@
307313 $editor = new RecordSetTableEditor($translatedTextAttributeValuesAttribute, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, $controller);
308314 $editor->addEditor(new TranslatedTextAttributeEditor($translatedTextAttributeAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName, $objectIdFetcher));
309315 $editor->addEditor(getTranslatedTextEditor($translatedTextValueAttribute, $translatedTextAttributeValueController, $filterLanguageId, $showRecordLifeSpan, $showAuthority));
310 - $editor->addEditor(new PopUpEditor($translatedTextValueObjectAttributesEditor, 'Annotation'));
 316+ $editor->addEditor(new PopUpEditor($translatedTextValueObjectAttributesEditor, $wgPopupAnnotationName));
311317
312318 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
313319
——@@ -315,13 +321,14 @@
316322
317323 function getOptionAttributeValuesEditor($showRecordLifeSpan, $showAuthority, $controller, $levelDefinedMeaningName, $objectIdFetcher) {
318324 global
319 - $optionAttributeAttribute, $optionAttributeOptionAttribute, $optionAttributeValuesAttribute, $optionValueObjectAttributesEditor;
 325+ $optionAttributeAttribute, $optionAttributeOptionAttribute, $optionAttributeValuesAttribute,
 326+ $optionValueObjectAttributesEditor, $wgPopupAnnotationName;
320327
321328 $editor = new RecordSetTableEditor($optionAttributeValuesAttribute, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, $controller);
322329
323330 $editor->addEditor(new OptionAttributeEditor($optionAttributeAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName, $objectIdFetcher));
324331 $editor->addEditor(new OptionSelectEditor($optionAttributeOptionAttribute, new SimplePermissionController(false), true));
325 - $editor->addEditor(new PopUpEditor($optionValueObjectAttributesEditor, 'Annotation'));
 332+ $editor->addEditor(new PopUpEditor($optionValueObjectAttributesEditor, $wgPopupAnnotationName));
326333
327334 addTableMetadataEditors($editor, $showRecordLifeSpan, $showAuthority);
328335
Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php
——@@ -427,7 +427,7 @@
428428 $definedMeaningAttribute, $definitionAttribute, $classAttributesAttribute,
429429 $alternativeDefinitionsAttribute, $synonymsAndTranslationsAttribute,
430430 $relationsAttribute, $reciprocalRelationsAttribute,
431 - $classMembershipAttribute, $collectionMembershipAttribute, $objectAttributesAttribute,
 431+ $classMembershipAttribute, $collectionMembershipAttribute, $definedMeaningAttributesAttribute,
432432 $possiblySynonymousAttribute;
433433
434434 $record = new ArrayRecord($definedMeaningAttribute->type->getStructure());
——@@ -447,7 +447,7 @@
448448 $record->setAttributeValue($reciprocalRelationsAttribute, getDefinedMeaningReciprocalRelationsRecordSet($definedMeaningId, $filterLanguageId, $queryTransactionInformation));
449449 $record->setAttributeValue($classMembershipAttribute, getDefinedMeaningClassMembershipRecordSet($definedMeaningId, $queryTransactionInformation));
450450 $record->setAttributeValue($collectionMembershipAttribute, getDefinedMeaningCollectionMembershipRecordSet($definedMeaningId, $queryTransactionInformation));
451 - $record->setAttributeValue($objectAttributesAttribute, getObjectAttributesRecord($definedMeaningId, $filterLanguageId, $queryTransactionInformation));
 451+ $record->setAttributeValue($definedMeaningAttributesAttribute, getObjectAttributesRecord($definedMeaningId, $filterLanguageId, $queryTransactionInformation));
452452
453453 return $record;
454454 }