r25143 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r25142‎ \| r25143 \| r25144 >
Date:	20:42, 25 August 2007
Author:	kim
Status:	old
Tags:
Comment:	Oops, make everything dromedarisCase O:-)
Modified paths:	/trunk/extensions/Wikidata/OmegaWiki/DefinedMeaning.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/OmegaWikiAttributes.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/SpecialAddCollection.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/SpecialConceptMapping.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/SpecialTransaction.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/Utilities.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/Wikidata.php (modified) (history) /trunk/extensions/Wikidata/OmegaWiki/small/autoreplace.sh (modified) (history)

Diff [purge]

Index: trunk/extensions/Wikidata/OmegaWiki/DefinedMeaning.php
—	—	@@ -188,7 +188,7 @@
189	189	$active=true; # wrong place, but hey
190	190	$dmId=$this->getDefinedMeaningId();
191	191	$dc=wdGetDataSetContext();
192		~~- $ow_conceptpanel=wfMsg_sc("concept_panel");~~
	192	+ $ow_conceptpanel=wfMsgSc("concept_panel");
193	193
194	194	$html="<div class=\"dataset-panel\">";;
195	195	$html.="<table border=\"0\"><tr><th class=\"dataset-panel-heading\">$ow_conceptpanel</th></tr>";
—	—	@@ -211,7 +211,7 @@
212	212	}
213	213	$cmtitle=Title::newFromText("Special:ConceptMapping");
214	214	$titleText=$wgTitle->getPrefixedURL();
215		~~- $cmlink=$sk->makeLinkObj($cmtitle,"<small>".wfMsg_sc("add_concept_link")."</small>","set_$dc=$dmId&suppressWarnings=true");~~
	215	+ $cmlink=$sk->makeLinkObj($cmtitle,"<small>".wfMsgSc("add_concept_link")."</small>","set_$dc=$dmId&suppressWarnings=true");
216	216	$html.="<tr><td>$cmlink</td></tr>\n";
217	217	if($wdShowCopyPanel) {
218	218	$html.="<tr><td>".$this->getCopyPanel()."<td><tr>";
—	—	@@ -230,7 +230,7 @@
231	231	# mostly same code as in SpecialAddCollection... possibly might
232	232	# make a nice separate function
233	233	$datasets=wdGetDatasets();
234		~~- $datasetarray['']=wfMsg('ow_none_selected');~~
	234	+ $datasetarray['']=wfMsgSc('ow_none_selected');
235	235	foreach($datasets as $datasetid=>$dataset) {
236	236	$datasetarray[$datasetid]=$dataset->fetchName();
237	237	}
Index: trunk/extensions/Wikidata/OmegaWiki/SpecialAddCollection.php
—	—	@@ -38,7 +38,7 @@
39	39	$wgOut->addHTML('<strong>Collection ' . $collectionName . ' added.</strong><br />');
40	40	}
41	41	$datasets=wdGetDatasets();
42		~~- $datasetarray['']=wfMsg('ow_none_selected');~~
	42	+ $datasetarray['']=wfMsgSc("none_selected");
43	43	foreach($datasets as $datasetid=>$dataset) {
44	44	$datasetarray[$datasetid]=$dataset->fetchName();
45	45	}
Index: trunk/extensions/Wikidata/OmegaWiki/Utilities.php
—	—	@@ -11,7 +11,7 @@
12	12	}
13	13
14	14
15		~~-function wfMsg_sc($message) {~~
	15	+function wfMsgSc($message) {
16	16	$args=func_get_args();
17	17	array_shift($args);
18	18	global
Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiAttributes.php
—	—	@@ -94,19 +94,19 @@
95	95	$t=$this; #<-keep things short to declutter
96	96
97	97	$t->in_setup=True;
98		~~- $t->language = new Attribute("language", wfMsg_sc("Language"), "language");~~
99		~~- $t->spelling = new Attribute("spelling", wfMsg_sc("Spelling"), "spelling");~~
100		~~- $t->text = new Attribute("text", wfMsg_sc("Text"), "text");~~
101		~~- $t->definedMeaningAttributes = new Attribute("defined-meaning-attributes", wfMsg_sc("DefinedMeaningAttributes"), "will-be-specified-below");~~
102		~~- $t->objectAttributes = new Attribute("object-attributes", wfMsg_sc("Annotation"), "will-be-specified-below");~~
	98	+ $t->language = new Attribute("language", wfMsgSc("Language"), "language");
	99	+ $t->spelling = new Attribute("spelling", wfMsgSc("Spelling"), "spelling");
	100	+ $t->text = new Attribute("text", wfMsgSc("Text"), "text");
	101	+ $t->definedMeaningAttributes = new Attribute("defined-meaning-attributes", wfMsgSc("DefinedMeaningAttributes"), "will-be-specified-below");
	102	+ $t->objectAttributes = new Attribute("object-attributes", wfMsgSc("Annotation"), "will-be-specified-below");
103	103	$t->expressionId = new Attribute("expression-id", "Expression Id", "expression-id");
104		~~- $t->identicalMeaning = new Attribute("indentical-meaning", wfMsg_sc("IdenticalMeaning"), "boolean");~~
	104	+ $t->identicalMeaning = new Attribute("indentical-meaning", wfMsgSc("IdenticalMeaning"), "boolean");
105	105
106	106	if ($viewInformation->filterOnLanguage())
107		~~- $t->expression = new Attribute("expression", wfMsg_sc("Spelling"), "spelling");~~
	107	+ $t->expression = new Attribute("expression", wfMsgSc("Spelling"), "spelling");
108	108	else {
109	109	$t->expressionStructure = new Structure("expression", $t->language, $t->spelling);
110		~~- $t->expression = new Attribute(null, wfMsg_sc("Expression"), $t->expressionStructure);~~
	110	+ $t->expression = new Attribute(null, wfMsgSc("Expression"), $t->expressionStructure);
111	111	}
112	112
113	113	$t->definedMeaningId = new Attribute("defined-meaning-id", "Defined meaning identifier", "defined-meaning-id");
—	—	@@ -126,68 +126,68 @@
127	127	$t->definedMeaningLabel = new Attribute("defined-meaning-label", "Defined meaning label", "short-text");
128	128	$t->definedMeaningReferenceStructure = new Structure("defined-meaning", $t->definedMeaningId, $t->definedMeaningLabel, $t->definedMeaningDefiningExpression);
129	129	$definedMeaningReferenceType = $t->definedMeaningReferenceStructure;
130		~~- $t->definedMeaningReference = new Attribute(null, wfMsg_sc("DefinedMeaningReference"), $definedMeaningReferenceType);~~
	130	+ $t->definedMeaningReference = new Attribute(null, wfMsgSc("DefinedMeaningReference"), $definedMeaningReferenceType);
131	131	$t->collectionId = new Attribute("collection", "Collection", "collection-id");
132		~~- $t->collectionMeaning = new Attribute("collection-meaning", wfMsg_sc("Collection"), $t->definedMeaningReferenceStructure);~~
133		~~- $t->sourceIdentifier = new Attribute("source-identifier", wfMsg_sc("SourceIdentifier"), "short-text");~~
	132	+ $t->collectionMeaning = new Attribute("collection-meaning", wfMsgSc("Collection"), $t->definedMeaningReferenceStructure);
	133	+ $t->sourceIdentifier = new Attribute("source-identifier", wfMsgSc("SourceIdentifier"), "short-text");
134	134	$t->gotoSourceStructure = new Structure("goto-source",$t->collectionId, $t->sourceIdentifier);
135		~~- $t->gotoSource = new Attribute(null, wfMsg_sc("GotoSource"), $t->gotoSourceStructure);~~
	135	+ $t->gotoSource = new Attribute(null, wfMsgSc("GotoSource"), $t->gotoSourceStructure);
136	136	$t->collectionMembershipStructure = new Structure("collection-membership",$t->collectionId, $t->collectionMeaning, $t->sourceIdentifier);
137		~~- $t->collectionMembership = new Attribute(null, wfMsg_sc("CollectionMembership"), $t->collectionMembershipStructure);~~
	137	+ $t->collectionMembership = new Attribute(null, wfMsgSc("CollectionMembership"), $t->collectionMembershipStructure);
138	138	$t->classMembershipId = new Attribute("class-membership-id", "Class membership id", "integer");
139	139	$t->class = new Attribute("class", "Class", $t->definedMeaningReferenceStructure);
140	140	$t->classMembershipStructure = new Structure("class-membership", $t->classMembershipId, $t->class);
141		~~- $t->classMembership = new Attribute(null, wfMsg_sc("ClassMembership"), $t->classMembershipStructure);~~
	141	+ $t->classMembership = new Attribute(null, wfMsgSc("ClassMembership"), $t->classMembershipStructure);
142	142
143	143	global
144	144	$wgPossiblySynonymousAttributeId;
145	145
146	146	$t->possiblySynonymousId = new Attribute("possibly-synonymous-id", "Possibly synonymous id", "integer");
147		~~- $t->possibleSynonym = new Attribute("possible-synonym", wfMsg_sc("PossibleSynonym"), $t->definedMeaningReferenceStructure);~~
	147	+ $t->possibleSynonym = new Attribute("possible-synonym", wfMsgSc("PossibleSynonym"), $t->definedMeaningReferenceStructure);
148	148	# Bug found ... This never worked before: (!)
149	149	#$t->possiblySynonymousStructure = new Structure("possibly-synonymous", $t->possiblySynonymousId, $t->possiblySynonymous);
150	150	$t->possiblySynonymousStructure = new Structure("possibly-synonymous", $t->possiblySynonymousId, $t->possibleSynonym);
151		~~- $t->possiblySynonymous = new Attribute(null, wfMsg_sc("PossiblySynonymous"), $t->possiblySynonymousStructure);~~
	151	+ $t->possiblySynonymous = new Attribute(null, wfMsgSc("PossiblySynonymous"), $t->possiblySynonymousStructure);
152	152
153	153	global
154	154	$relationTypeType;
155	155
156	156	$t->relationId = new Attribute("relation-id", "Relation identifier", "object-id");
157		~~- $t->relationType = new Attribute("relation-type", wfMsg_sc("RelationType"), $t->definedMeaningReferenceStructure);~~
158		~~- $t->otherDefinedMeaning = new Attribute("other-defined-meaning", wfMsg_sc("OtherDefinedMeaning"), $definedMeaningReferenceType);~~
	157	+ $t->relationType = new Attribute("relation-type", wfMsgSc("RelationType"), $t->definedMeaningReferenceStructure);
	158	+ $t->otherDefinedMeaning = new Attribute("other-defined-meaning", wfMsgSc("OtherDefinedMeaning"), $definedMeaningReferenceType);
159	159
160	160	global
161	161	$wgRelationsAttributeId, $wgIncomingRelationsAttributeId ;
162	162
163	163	$t->relationStructure = new Structure("relations", $t->relationId, $t->relationType, $t->otherDefinedMeaning, $t->objectAttributes);
164		~~- $t->relations = new Attribute(null, wfMsg_sc("Relations"), $t->relationStructure);~~
165		~~- $t->reciprocalRelations = new Attribute("reciprocal-relations", wfMsg_sc("IncomingRelations"), $t->relationStructure);~~
	164	+ $t->relations = new Attribute(null, wfMsgSc("Relations"), $t->relationStructure);
	165	+ $t->reciprocalRelations = new Attribute("reciprocal-relations", wfMsgSc("IncomingRelations"), $t->relationStructure);
166	166	$t->translatedTextId = new Attribute("translated-text-id", "Translated text ID", "integer");
167	167	$t->translatedTextStructure = new Structure("translated-text", $t->language, $t->text);
168	168
169	169	$t->definitionId = new Attribute("definition-id", "Definition identifier", "integer");
170	170
171	171	if ($viewInformation->filterOnLanguage() && !$viewInformation->hasMetaDataAttributes())
172		~~- $t->alternativeDefinition = new Attribute("alternative-definition", wfMsg_sc("AlternativeDefinition"), "text");~~
	172	+ $t->alternativeDefinition = new Attribute("alternative-definition", wfMsgSc("AlternativeDefinition"), "text");
173	173	else
174		~~- $t->alternativeDefinition = new Attribute("alternative-definition", wfMsg_sc("AlternativeDefinition"), $t->translatedTextStructure);~~
	174	+ $t->alternativeDefinition = new Attribute("alternative-definition", wfMsgSc("AlternativeDefinition"), $t->translatedTextStructure);
175	175
176		~~- $t->source = new Attribute("source-id", wfMsg_sc("Source"), $definedMeaningReferenceType);~~
	176	+ $t->source = new Attribute("source-id", wfMsgSc("Source"), $definedMeaningReferenceType);
177	177
178	178	global
179	179	$wgAlternativeDefinitionsAttributeId;
180	180
181	181	$t->alternativeDefinitionsStructure = new Structure("alternative-definitions", $t->definitionId, $t->alternativeDefinition, $t->source);
182	182
183		~~- $t->alternativeDefinitions = new Attribute(null, wfMsg_sc("AlternativeDefinitions"), $t->alternativeDefinitionsStructure);~~
	183	+ $t->alternativeDefinitions = new Attribute(null, wfMsgSc("AlternativeDefinitions"), $t->alternativeDefinitionsStructure);
184	184
185	185	global
186	186	$wgSynonymsAndTranslationsAttributeId;
187	187
188	188	if ($viewInformation->filterOnLanguage())
189		~~- $synonymsAndTranslationsCaption = wfMsg_sc("Synonyms");~~
	189	+ $synonymsAndTranslationsCaption = wfMsgSc("Synonyms");
190	190	else
191		~~- $synonymsAndTranslationsCaption = wfMsg_sc("SynonymsAndTranslations");~~
	191	+ $synonymsAndTranslationsCaption = wfMsgSc("SynonymsAndTranslations");
192	192
193	193	$t->attributeObjectId = new Attribute("attributeObjectId", "Attribute object", "object-id");
194	194
—	—	@@ -195,59 +195,59 @@
196	196	$t->synonymsTranslationsStructure = new Structure("synonyms-translations", $t->syntransId, $t->expression, $t->identicalMeaning, $t->objectAttributes);
197	197	$t->synonymsAndTranslations = new Attribute(null, "$synonymsAndTranslationsCaption", $t->synonymsTranslationsStructure);
198	198	$t->translatedTextAttributeId = new Attribute("translated-text-attribute-id", "Attribute identifier", "object-id");
199		~~- $t->translatedTextAttribute = new Attribute("translated-text-attribute", wfMsg_sc("TranslatedTextAttribute"), $definedMeaningReferenceType);~~
	199	+ $t->translatedTextAttribute = new Attribute("translated-text-attribute", wfMsgSc("TranslatedTextAttribute"), $definedMeaningReferenceType);
200	200	$t->translatedTextValueId = new Attribute("translated-text-value-id", "Translated text value identifier", "translated-text-value-id");
201	201
202	202	if ($viewInformation->filterOnLanguage() && !$viewInformation->hasMetaDataAttributes())
203		~~- $t->translatedTextValue = new Attribute("translated-text-value", wfMsg_sc("TranslatedTextAttributeValue"), "text");~~
	203	+ $t->translatedTextValue = new Attribute("translated-text-value", wfMsgSc("TranslatedTextAttributeValue"), "text");
204	204	else
205		~~- $t->translatedTextValue = new Attribute("translated-text", wfMsg_sc("TranslatedTextAttributeValue"), $t->translatedTextStructure);~~
	205	+ $t->translatedTextValue = new Attribute("translated-text", wfMsgSc("TranslatedTextAttributeValue"), $t->translatedTextStructure);
206	206
207	207	$t->translatedTextAttributeValuesStructure = new Structure("translated-text-attribute-values",$t->translatedTextAttributeId, $t->attributeObjectId, $t->translatedTextAttribute, $t->translatedTextValueId, $t->translatedTextValue, $t->objectAttributes);
208		~~- $t->translatedTextAttributeValues = new Attribute(null, wfMsg_sc("TranslatedTextAttributeValues"), $t->translatedTextAttributeValuesStructure);~~
	208	+ $t->translatedTextAttributeValues = new Attribute(null, wfMsgSc("TranslatedTextAttributeValues"), $t->translatedTextAttributeValuesStructure);
209	209	$t->attributeObject = new Attribute("attribute-object-id", "Attribute object", "object-id");
210	210	$t->textAttributeId = new Attribute("text-attribute-id", "Attribute identifier", "object-id");
211	211	$t->textAttributeObject = new Attribute("text-attribute-object-id", "Attribute object", "object-id");
212		~~- $t->textAttribute = new Attribute("text-attribute", wfMsg_sc("TextAttribute"), $t->definedMeaningReferenceStructure);~~
	212	+ $t->textAttribute = new Attribute("text-attribute", wfMsgSc("TextAttribute"), $t->definedMeaningReferenceStructure);
213	213	$t->textAttributeValuesStructure = new Structure("text-attribute-values", $t->textAttributeId, $t->textAttributeObject, $t->textAttribute, $t->text, $t->objectAttributes);
214		~~- $t->textAttributeValues = new Attribute(null, wfMsg_sc("TextAttributeValues"), $t->textAttributeValuesStructure);~~
	214	+ $t->textAttributeValues = new Attribute(null, wfMsgSc("TextAttributeValues"), $t->textAttributeValuesStructure);
215	215	$t->linkLabel = new Attribute("label", "Label", "short-text");
216	216	$t->linkURL = new Attribute("url", "URL", "url");
217	217	$t->link = new Attribute("link", "Link", new Structure($t->linkLabel, $t->linkURL));
218	218
219	219	$t->linkAttributeId = new Attribute("link-attribute-id", "Attribute identifier", "object-id");
220	220	$t->linkAttributeObject = new Attribute("link-attribute-object-id", "Attribute object", "object-id");
221		~~- $t->linkAttribute = new Attribute("link-attribute", wfMsg_sc("LinkAttribute"), $t->definedMeaningReferenceStructure);~~
	221	+ $t->linkAttribute = new Attribute("link-attribute", wfMsgSc("LinkAttribute"), $t->definedMeaningReferenceStructure);
222	222	$t->linkAttributeValuesStructure = new Structure("link-attribute-values", $t->linkAttributeId, $t->linkAttributeObject, $t->linkAttribute, $t->link, $t->objectAttributes);
223		~~- $t->linkAttributeValues = new Attribute(null, wfMsg_sc("LinkAttributeValues"), $t->linkAttributeValuesStructure);~~
	223	+ $t->linkAttributeValues = new Attribute(null, wfMsgSc("LinkAttributeValues"), $t->linkAttributeValuesStructure);
224	224	$t->optionAttributeId = new Attribute('option-attribute-id', 'Attribute identifier', 'object-id');
225	225	$t->optionAttributeObject = new Attribute('option-attribute-object-id', 'Attribute object', 'object-id');
226		~~- $t->optionAttribute = new Attribute('option-attribute', wfMsg_sc("OptionAttribute"), $definedMeaningReferenceType);~~
227		~~- $t->optionAttributeOption = new Attribute('option-attribute-option', wfMsg_sc("OptionAttributeOption"), $definedMeaningReferenceType);~~
	226	+ $t->optionAttribute = new Attribute('option-attribute', wfMsgSc("OptionAttribute"), $definedMeaningReferenceType);
	227	+ $t->optionAttributeOption = new Attribute('option-attribute-option', wfMsgSc("OptionAttributeOption"), $definedMeaningReferenceType);
228	228	$t->optionAttributeValuesStructure = new Structure('option-attribute-values', $t->optionAttributeId, $t->optionAttribute, $t->optionAttributeObject, $t->optionAttributeOption, $t->objectAttributes);
229		~~- $t->optionAttributeValues = new Attribute(null, wfMsg_sc("OptionAttributeValues"), $t->optionAttributeValuesStructure);~~
	229	+ $t->optionAttributeValues = new Attribute(null, wfMsgSc("OptionAttributeValues"), $t->optionAttributeValuesStructure);
230	230	$t->optionAttributeOptionId = new Attribute('option-attribute-option-id', 'Option identifier', 'object-id');
231	231	$t->optionAttributeOptionsStructure = new Structure('option-attribute-options', $t->optionAttributeOptionId, $t->optionAttribute, $t->optionAttributeOption, $t->language);
232		~~- $t->optionAttributeOptions = new Attribute(null, wfMsg_sc("OptionAttributeOptions"), $t->optionAttributeOptionsStructure);~~
	232	+ $t->optionAttributeOptions = new Attribute(null, wfMsgSc("OptionAttributeOptions"), $t->optionAttributeOptionsStructure);
233	233
234	234	if ($viewInformation->filterOnLanguage() && !$viewInformation->hasMetaDataAttributes())
235		~~- $t->translatedText = new Attribute("translated-text", wfMsg_sc("Text"), "text");~~
	235	+ $t->translatedText = new Attribute("translated-text", wfMsgSc("Text"), "text");
236	236	else
237		~~- $t->translatedText = new Attribute(null, wfMsg_sc("TranslatedText"), $t->translatedTextStructure);~~
	237	+ $t->translatedText = new Attribute(null, wfMsgSc("TranslatedText"), $t->translatedTextStructure);
238	238
239		~~- $t->definition = new Attribute(null, wfMsg_sc("Definition"), new Structure("definition", $t->translatedText, $t->objectAttributes));~~
	239	+ $t->definition = new Attribute(null, wfMsgSc("Definition"), new Structure("definition", $t->translatedText, $t->objectAttributes));
240	240
241	241	global
242	242	$wgClassAttributesAttributeId;
243	243
244	244	$t->classAttributeId = new Attribute("class-attribute-id", "Class attribute identifier", "object-id");
245		~~- $t->classAttributeAttribute = new Attribute("class-attribute-attribute", wfMsg_sc("ClassAttributeAttribute"), $t->definedMeaningReferenceStructure);~~
246		~~- $t->classAttributeLevel = new Attribute("class-attribute-level", wfMsg_sc("ClassAttributeLevel"), $t->definedMeaningReferenceStructure);~~
247		~~- $t->classAttributeType = new Attribute("class-attribute-type", wfMsg_sc("ClassAttributeType"), "short-text");~~
	245	+ $t->classAttributeAttribute = new Attribute("class-attribute-attribute", wfMsgSc("ClassAttributeAttribute"), $t->definedMeaningReferenceStructure);
	246	+ $t->classAttributeLevel = new Attribute("class-attribute-level", wfMsgSc("ClassAttributeLevel"), $t->definedMeaningReferenceStructure);
	247	+ $t->classAttributeType = new Attribute("class-attribute-type", wfMsgSc("ClassAttributeType"), "short-text");
248	248	$t->classAttributesStructure = new Structure("class-attributes", $t->classAttributeId, $t->classAttributeAttribute, $t->classAttributeLevel, $t->classAttributeType, $t->optionAttributeOptions);
249		~~- $t->classAttributes = new Attribute(null, wfMsg_sc("ClassAttributes"), $t->classAttributesStructure);~~
	249	+ $t->classAttributes = new Attribute(null, wfMsgSc("ClassAttributes"), $t->classAttributesStructure);
250	250
251		~~- $t->definedMeaning = new Attribute(null, wfMsg_sc("DefinedMeaning"),~~
	251	+ $t->definedMeaning = new Attribute(null, wfMsgSc("DefinedMeaning"),
252	252	new Structure(
253	253	"defined-meaning",
254	254	$t->definition,
—	—	@@ -262,13 +262,13 @@
263	263	);
264	264
265	265	$t->expressionMeaningStructure = new Structure("expression-exact-meanings", $t->definedMeaningId, $t->text, $t->definedMeaning);
266		~~- $t->expressionExactMeanings = new Attribute(null, wfMsg_sc("ExactMeanings"), $t->expressionMeaningStructure);~~
267		~~- $t->expressionApproximateMeanings = new Attribute("expression-approximate-meanings", wfMsg_sc("ApproximateMeanings"), $t->expressionMeaningStructure);~~
	266	+ $t->expressionExactMeanings = new Attribute(null, wfMsgSc("ExactMeanings"), $t->expressionMeaningStructure);
	267	+ $t->expressionApproximateMeanings = new Attribute("expression-approximate-meanings", wfMsgSc("ApproximateMeanings"), $t->expressionMeaningStructure);
268	268	# bug found here also: $t->expressionAoproximateMeaning_S_
269	269	$t->expressionMeaningsStructure = new Structure("expression-meanings", $t->expressionExactMeanings, $t->expressionApproximateMeanings);
270		~~- $t->expressionMeanings = new Attribute(null, wfMsg_sc("ExpressionMeanings"), $t->expressionMeaningsStructure);~~
	270	+ $t->expressionMeanings = new Attribute(null, wfMsgSc("ExpressionMeanings"), $t->expressionMeaningsStructure);
271	271	$t->expressionsStructure = new Structure("expressions", $t->expressionId, $t->expression, $t->expressionMeanings);
272		~~- $t->expressions = new Attribute(null, wfMsg_sc("Expressions"), $t->expressionsStructure);~~
	272	+ $t->expressions = new Attribute(null, wfMsgSc("Expressions"), $t->expressionsStructure);
273	273	$t->objectId = new Attribute("object-id", "Object identifier", "object-id");
274	274	$t->objectAttributesStructure = new Structure("object-attributes", $t->objectId, $t->textAttributeValues, $t->translatedTextAttributeValues, $t->optionAttributeValues);
275	275	$t->objectAttributes->setAttributeType($t->objectAttributesStructure);
Index: trunk/extensions/Wikidata/OmegaWiki/SpecialTransaction.php
—	—	@@ -80,7 +80,7 @@
81	81	'<div class="option-panel">'.
82	82	'<table cellpadding="0" cellspacing="0">' .
83	83	'<tr>' .
84		~~- '<th>' . wfMsg('summary') . ': </th>' .~~
	84	+ '<th>' . wfMsgSc("summary") . ': </th>' .
85	85	'<td class="option-field">' . getTextBox("summary") .'</td>' .
86	86	'</tr>' .
87	87	'<tr><th/><td>'. getSubmitButton("roll-back", "Roll back") .'</td></tr>'.
Index: trunk/extensions/Wikidata/OmegaWiki/Wikidata.php
—	—	@@ -90,7 +90,7 @@
91	91	protected function getDataSetPanel() {
92	92	global $wgTitle, $wgUser;
93	93	$dc=wdGetDataSetContext();
94		~~- $ow_datasets=wfMsg('ow_datasets');~~
	94	+ $ow_datasets=wfMsgSc("datasets");
95	95	$html="<div class=\"dataset-panel\">";;
96	96	$html.="<table border=\"0\"><tr><th class=\"dataset-panel-heading\">$ow_datasets</th></tr>";
97	97	$dataSets=wdGetDataSets();
—	—	@@ -154,8 +154,8 @@
155	155
156	156	$dc=wdGetDataSetContext();
157	157	if(!$wgUser->isAllowed('editwikidata-'.$dc)) {
158		~~- $wgOut->addWikiText(wfMsg('ow_noedit',$dc->fetchName()));~~
159		~~- $wgOut->setPageTitle(wfMsg('ow_noedit_title'));~~
	158	+ $wgOut->addWikiText(wfMsgSc("noedit",$dc->fetchName()));
	159	+ $wgOut->setPageTitle(wfMsgSc("noedit_title"));
160	160	return false;
161	161	}
162	162
—	—	@@ -189,7 +189,7 @@
190	190	if (!$this->showClassicPageTitles)
191	191	$title = $this->getTitle();
192	192
193		~~- $wgOut->setPageTitle(wfMsg('ow_history',$title));~~
	193	+ $wgOut->setPageTitle(wfMsgSc("history",$title));
194	194
195	195	# Plain filter for the lifespan info about each record
196	196	if (isset($_GET['show'])) {
—	—	@@ -240,7 +240,7 @@
241	241	$title = $this->getTitle();
242	242
243	243	$wgOut->setPageTitle($title);
244		~~- $wgOut->setPageTitle(wfMsg('editing',$title));~~
	244	+ $wgOut->setPageTitle(wfMsgSc("editing",$title));
245	245
246	246	$wgOut->addHTML(
247	247	'<form method="post" action="">' .
—	—	@@ -255,10 +255,10 @@
256	256	$wgOut->addHTML(
257	257	'<div class="option-panel">'.
258	258	'<table cellpadding="0" cellspacing="0"><tr>' .
259		~~- '<th>' . wfMsg('summary') . ': </th>' .~~
	259	+ '<th>' . wfMsgSc("summary") . ': </th>' .
260	260	'<td class="option-field">' . getTextBox("summary") .'</td>' .
261	261	'</tr></table>' .
262		~~- getSubmitButton("save", wfMsg('ow_save')).~~
	262	+ getSubmitButton("save", wfMsgSc("save")).
263	263	'</div>'
264	264	);
265	265
Index: trunk/extensions/Wikidata/OmegaWiki/SpecialConceptMapping.php
—	—	@@ -55,8 +55,8 @@
56	56	} elseif ($action=="get_associated"){
57	57	$this->get_associated();
58	58	} else {
59		~~- $wgOut->addWikiText(wfMsg('ow_conceptmapping_no_action_specified',$action));~~
60		~~- $wgOut->addWikiText(wfMsg('ow_conceptmapping_help'));~~
	59	+ $wgOut->addWikiText(wfMsgSc("conceptmapping_no_action_specified",$action));
	60	+ $wgOut->addWikiText(wfMsgSc("conceptmapping_help"));
61	61	}
62	62	}
63	63
—	—	@@ -65,7 +65,7 @@
66	66	global $wgOut, $wgRequest, $wgUser;
67	67	$lang=$wgUser->getOption("language");
68	68	require_once("forms.php");
69		~~- $wgOut->addHTML(wfMsg('ow_conceptmapping_uitext'));~~
	69	+ $wgOut->addHTML(wfMsgSc("conceptmapping_uitext"));
70	70	$sets=wdGetDataSets();
71	71	$options = array();
72	72	$html="";
—	—	@@ -92,7 +92,7 @@
93	93	foreach ($sets as $key=>$setObject) {
94	94	$set=$setObject->getPrefix();
95	95	if(!$rq[$set]) {
96		~~- $wgOut->addHTML(' <span style="color:yellow">['.wfMsg('ow_dm_not_present').']</span>');~~
	96	+ $wgOut->addHTML(' <span style="color:yellow">['.wfMsgSc("dm_not_present").']</span>');
97	97	} else {
98	98	$dmModel=new DefinedMeaningModel($rq[$set],null,$setObject);
99	99	$dmModel->checkExistence();
—	—	@@ -109,11 +109,11 @@
110	110	if ($id!=null) {
111	111	$mappings[$key]=$id;
112	112	if(!$noerror) {
113		~~- $wgOut->addHTML(' <span style="color:green">['.wfMsg('ow_dm_OK').']</span>');~~
	113	+ $wgOut->addHTML(' <span style="color:green">['.wfMsgSc("dm_OK").']</span>');
114	114	}
115	115	} else {
116	116	if(!$noerror) {
117		~~- $wgOut->addHTML(' <span style="color:red">['.wfMsg('ow_dm_not_found').']</span>');~~
	117	+ $wgOut->addHTML(' <span style="color:red">['.wfMsgSc("dm_not_found").']</span>');
118	118	}
119	119	}
120	120	}
—	—	@@ -121,9 +121,9 @@
122	122	}
123	123	if (sizeOf($mappings)>1) {
124	124	createConceptMapping($mappings);
125		~~- $wgOut->addHTML(wfMsg('ow_mapping_successful'));~~
	125	+ $wgOut->addHTML(wfMsgSc("mapping_successful"));
126	126	} else {
127		~~- $wgOut->addHTML(wfMsg('ow_mapping_unsuccessful'));~~
	127	+ $wgOut->addHTML(wfMsgSc("mapping_unsuccessful"));
128	128	}
129	129
130	130	}
—	—	@@ -140,7 +140,7 @@
141	141	protected function help() {
142	142	global $wgOut;
143	143	$wgOut->addWikiText("<h2>Help</h2>");
144		~~- $wgOut->addWikiText(wfMsg('ow_conceptmapping_help'));~~
	144	+ $wgOut->addWikiText(wfMsgSc("conceptmapping_help"));
145	145	}
146	146
147	147	protected function insert() {
—	—	@@ -150,7 +150,7 @@
151	151	# $wgRequest->getText( 'page' );
152	152	$sets=wdGetDataSets();
153	153	#$requests=$wgRequest->getValues();
154		~~- $wgOut->addWikiText("<h2>".wfMsg('ow_will_insert')."</h2>");~~
	154	+ $wgOut->addWikiText("<h2>".wfMsgSc("will_insert")."</h2>");
155	155	$map=array();
156	156	foreach ($sets as $key => $set) {
157	157	$dc=$set->getPrefix();
—	—	@@ -171,7 +171,7 @@
172	172	global
173	173	$wgOut, $wgRequest;
174	174	$concept_id=$wgRequest->getText("concept");
175		~~- $wgOut->addWikiText("<h2>".wfMsg('ow_contents_of_mapping')."</h2>");~~
	175	+ $wgOut->addWikiText("<h2>".wfMsgSc("contents_of_mapping")."</h2>");
176	176	$map=readConceptMapping($concept_id);
177	177	#$sets=wdGetDataSets();
178	178
—	—	@@ -182,7 +182,7 @@
183	183
184	184	protected function list_sets() {
185	185	global $wgOut;
186		~~- $wgOut->addWikiText("<h2>".wfMsg('available contexts')."</h2>");~~
	186	+ $wgOut->addWikiText("<h2>".wfMsgSc("available contexts")."</h2>");
187	187	$sets=wdGetDataSets();
188	188	foreach ($sets as $key => $set) {
189	189	$name=$set->fetchName();
Index: trunk/extensions/Wikidata/OmegaWiki/small/autoreplace.sh
—	—	@@ -1,5 +1,5 @@
2	2	#!/bin/bash
3	3	export myfile=$1;
4	4
5		~~-small/wfMsg.pl $myfile > $myfile.new &&~~
	5	+perl -pe "s/wfMsg_sc/wfMsgSc/g" $myfile > $myfile.new &&
6	6	mv $myfile.new $myfile

Status & tagging log

15:20, 12 September 2011 Meno25 (talk | contribs) changed the status of r25143 [removed: ok added: old]