| Index: trunk/extensions/SemanticMediaWiki/includes/parserhooks/SMW_Subobject.php |
| — | — | @@ -27,10 +27,17 @@ |
| 28 | 28 | |
| 29 | 29 | $params = func_get_args(); |
| 30 | 30 | array_shift( $params ); // We already know the $parser ... |
| | 31 | + |
| 31 | 32 | $subobjectName = str_replace( ' ', '_', trim( array_shift( $params ) ) ); |
| | 33 | + $mainSemanticData = SMWParseData::getSMWData( $parser ); |
| | 34 | + $subject = $mainSemanticData->getSubject(); |
| 32 | 35 | |
| 33 | | - $semanticData = SMWParseData::getSMWData( $parser )->getChild( $subobjectName ); |
| | 36 | + $diSubWikiPage = new SMWDIWikiPage( $subject->getDBkey(), |
| | 37 | + $subject->getNamespace(), $subject->getInterwiki(), |
| | 38 | + $subobjectName ); |
| 34 | 39 | |
| | 40 | + $semanticData = new SMWContainerSemanticData( $diSubWikiPage ); |
| | 41 | + |
| 35 | 42 | foreach ( $params as $param ) { |
| 36 | 43 | $parts = explode( '=', trim( $param ), 2 ); |
| 37 | 44 | |
| — | — | @@ -42,6 +49,10 @@ |
| 43 | 50 | } |
| 44 | 51 | } |
| 45 | 52 | |
| | 53 | + $propertyDi = new SMWDIProperty('_SOBJ'); |
| | 54 | + $subObjectDi = new SMWDIContainer( $semanticData ); |
| | 55 | + SMWParseData::getSMWData( $parser )->addPropertyObjectValue( $propertyDi, $subObjectDi ); |
| | 56 | + |
| 46 | 57 | return smwfEncodeMessages( self::$m_errors ); |
| 47 | 58 | } |
| 48 | 59 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php |
| — | — | @@ -735,9 +735,6 @@ |
| 736 | 736 | $sid = $this->makeSMWPageID( $subject->getDBkey(), $subject->getNamespace(), $subject->getInterwiki(), $subject->getSubobjectName(), true, $sortkey ); |
| 737 | 737 | $updates = array(); // collect data for bulk updates; format: tableid => updatearray |
| 738 | 738 | $this->prepareDBUpdates( $updates, $data, $sid, $subject ); |
| 739 | | - foreach ( $data->getAllChildren() as $childData ) { |
| 740 | | - $this->prepareDBUpdates( $updates, $childData, 0, $childData->getSubject() ); |
| 741 | | - } |
| 742 | 739 | |
| 743 | 740 | $db = wfGetDB( DB_MASTER ); |
| 744 | 741 | foreach ( $updates as $tablename => $uvals ) { |
| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SparqlStore.php |
| — | — | @@ -60,10 +60,6 @@ |
| 61 | 61 | parent::doDataUpdate( $data ); |
| 62 | 62 | |
| 63 | 63 | $expDataArray = $this->prepareUpdateExpData( $data ); |
| 64 | | - foreach ( $data->getAllChildren() as $childData ) { |
| 65 | | - $subExpDataArray = $this->prepareUpdateExpData( $childData ); |
| 66 | | - $expDataArray = $expDataArray + $subExpDataArray; |
| 67 | | - } |
| 68 | 64 | |
| 69 | 65 | if ( count( $expDataArray ) > 0 ) { |
| 70 | 66 | $subjectResource = SMWExporter::getDataItemExpElement( $data->getSubject() ); |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_SemanticData.php |
| — | — | @@ -55,31 +55,7 @@ |
| 56 | 56 | */ |
| 57 | 57 | protected $mProperties = array(); |
| 58 | 58 | |
| 59 | | - |
| 60 | 59 | /** |
| 61 | | - * Array of SMWSemanticData objects that refer to subobjects of this |
| 62 | | - * object and for which this object is the parent. Elements in this |
| 63 | | - * array are created (only) by calling the method getChild(). |
| 64 | | - * Existing data from other SMWSemanticData objects can be imported |
| 65 | | - * into such children by calling the child's importDataFrom() |
| 66 | | - * method. |
| 67 | | - * |
| 68 | | - * The array is indexed by the subobject name of the children's |
| 69 | | - * subjects. |
| 70 | | - * |
| 71 | | - * @note The subject SMWDIWikiPage of a child is always a subobject of |
| 72 | | - * the subject of its parent. Nevertheless, it is perfectly possible to |
| 73 | | - * create an SMWSemanticData for a subject that is a subobject without |
| 74 | | - * this SMWSemanticData being a child of anything. |
| 75 | | - * |
| 76 | | - * @since 1.7 |
| 77 | | - * @see SMWSemanticData::getChild() |
| 78 | | - * |
| 79 | | - * @var array of string => SMWSemanticData |
| 80 | | - */ |
| 81 | | - protected $mChildren = array(); |
| 82 | | - |
| 83 | | - /** |
| 84 | 60 | * States whether the container holds any normal properties. |
| 85 | 61 | * |
| 86 | 62 | * @var boolean |
| — | — | @@ -119,18 +95,6 @@ |
| 120 | 96 | protected $mSubject; |
| 121 | 97 | |
| 122 | 98 | /** |
| 123 | | - * If the data describes a subobject, this field refers to its parent |
| 124 | | - * object. To associate a semantic data with its parent, the method |
| 125 | | - * getChild() can be used (see documentation there for details). |
| 126 | | - * |
| 127 | | - * @since 1.7 |
| 128 | | - * @see SMWSemanticData::getChild() |
| 129 | | - * |
| 130 | | - * @var SMWSemanticData or null |
| 131 | | - */ |
| 132 | | - protected $mParentSemanticData = null; |
| 133 | | - |
| 134 | | - /** |
| 135 | 99 | * Constructor. |
| 136 | 100 | * |
| 137 | 101 | * @param SMWDIWikiPage $subject to which this data refers |
| — | — | @@ -169,68 +133,6 @@ |
| 170 | 134 | } |
| 171 | 135 | |
| 172 | 136 | /** |
| 173 | | - * Return a semantic data object to store data of the subobject with |
| 174 | | - * the given name. If no data container exists for this purpose yet, |
| 175 | | - * a new one will be created. Globally, child data has the same meaning |
| 176 | | - * as if it was used in a separate SMWSemanticData (with the same |
| 177 | | - * subobject as subject but which is not a child). The child-parent |
| 178 | | - * association is merely used to attach extra data to an SMWSemanticData |
| 179 | | - * so that a single object can carry information about all related |
| 180 | | - * subobjects. |
| 181 | | - * |
| 182 | | - * Contrary to biological intuition, children are always managed by the |
| 183 | | - * (unique) parent: when calling getChild() on a child SMWSemanticData, |
| 184 | | - * the new child will be attached to the old child's parent. So there is |
| 185 | | - * no hierarchy of children and all existing children can be accessed |
| 186 | | - * through the parent. In the rare case that the given subobject name for |
| 187 | | - * the child is the same as the subobject name of the subject of $this, |
| 188 | | - * the method wil return $this instead of creating a new child. |
| 189 | | - * |
| 190 | | - * Overall, this management ensures that there will be at most one |
| 191 | | - * SMWSemanticData object for any subobjectName. Note that the relation |
| 192 | | - * parent-child is not the same as the relation page-subobject. A parent |
| 193 | | - * SMWSemanticData can still refer to a subject with an empty subobject |
| 194 | | - * name, while a child's subobject name might be empty. |
| 195 | | - * |
| 196 | | - * @see SMWSemanticData::importDataFrom() |
| 197 | | - * @see SMWSemanticData::mChildren |
| 198 | | - * |
| 199 | | - * @since 1.7 |
| 200 | | - * |
| 201 | | - * @param String $subobjectName must be non-empty |
| 202 | | - * @return SMWSemanticData |
| 203 | | - */ |
| 204 | | - public function getChild( $subobjectName ) { |
| 205 | | - if ( $subobjectName == $this->mSubject->getSubobjectName() ) { |
| 206 | | - return $this; |
| 207 | | - } elseif ( !is_null( $this->mParentSemanticData ) ) { |
| 208 | | - return $this->mParentSemanticData->getChild( $subobjectName ); |
| 209 | | - } elseif ( array_key_exists( $subobjectName, $this->mChildren ) ) { |
| 210 | | - return $this->mChildren[$subobjectName]; |
| 211 | | - } else { |
| 212 | | - $diSubWikiPage = new SMWDIWikiPage( $this->mSubject->getDBkey(), |
| 213 | | - $this->mSubject->getNamespace(), $this->mSubject->getInterwiki(), |
| 214 | | - $subobjectName ); |
| 215 | | - $result = new SMWSemanticData( $diSubWikiPage ); |
| 216 | | - $result->mParentSemanticData = $this; |
| 217 | | - $this->mChildren[$subobjectName] = $result; |
| 218 | | - return $result; |
| 219 | | - } |
| 220 | | - } |
| 221 | | - |
| 222 | | - /** |
| 223 | | - * Return an array of SMWSemanticData objects for all children of this |
| 224 | | - * object, indexed by the subobject name that they are using. |
| 225 | | - * |
| 226 | | - * @since 1.7 |
| 227 | | - * |
| 228 | | - * @return array of SMWSemanticData |
| 229 | | - */ |
| 230 | | - public function getAllChildren() { |
| 231 | | - return $this->mChildren; |
| 232 | | - } |
| 233 | | - |
| 234 | | - /** |
| 235 | 137 | * Get the array of all properties that have stored values. |
| 236 | 138 | * |
| 237 | 139 | * @return array of SMWDIProperty objects |
| — | — | @@ -280,10 +182,6 @@ |
| 281 | 183 | } |
| 282 | 184 | } |
| 283 | 185 | |
| 284 | | - foreach ( $this->mChildren as $child ) { |
| 285 | | - hash_update( $ctx, '_#_' . $child->getHash() . '##' ); |
| 286 | | - } |
| 287 | | - |
| 288 | 186 | return hash_final( $ctx ); |
| 289 | 187 | } |
| 290 | 188 | |
| — | — | @@ -390,34 +288,12 @@ |
| 391 | 289 | $this->mHasVisibleProps = false; |
| 392 | 290 | $this->mHasVisibleSpecs = false; |
| 393 | 291 | $this->stubObject = false; |
| 394 | | - $mParentSemanticData = null; |
| 395 | | - $this->mChildren = array(); |
| 396 | 292 | } |
| 397 | 293 | |
| 398 | 294 | /** |
| 399 | | - * Add all data from the given SMWSemanticData. Children will be added |
| 400 | | - * recursively and might be moved to the parent of $this object (if it |
| 401 | | - * is a child of something else). |
| | 295 | + * Add all data from the given SMWSemanticData. |
| 402 | 296 | * |
| 403 | | - * @note The subject of the SMWSemanticData that is imported is not |
| 404 | | - * relevant to the result of this operation, but the subobject names of |
| 405 | | - * its children (if any) will be used. Therefore, if one of the children |
| 406 | | - * has the same subobject name as the subject of the SMWSemanticData |
| 407 | | - * into which the data is imported, then the data of imported parent |
| 408 | | - * and the eponymous child will be combined into a single object. |
| 409 | | - * Example: we have data about "Foo#Bar" (no children) and we import |
| 410 | | - * data about "Baz" with a child "Baz#Bar". Then the result will be |
| 411 | | - * about "Foo#Bar" and have no children but all data from the three |
| 412 | | - * sources. The original data from "Foo#Bar" is kept, the data from |
| 413 | | - * "Baz" is imported (ignoring the name "Baz"), and the data of the |
| 414 | | - * child "Baz#Bar" is merged into "Foo#Bar" (using only the subobject |
| 415 | | - * name). While slightly subtle, this should make sense in most cases. |
| 416 | | - * Typically, if "Baz" != "Foo" then "Baz" is just some internal page |
| 417 | | - * name that is used as a placeholder. Children can never hold data |
| 418 | | - * about other pages, so mergnig all data is most likely desired. |
| 419 | | - * |
| 420 | 297 | * @since 1.7 |
| 421 | | - * @see SMWSemanticData::getChild() |
| 422 | 298 | * |
| 423 | 299 | * @param $semanticData SMWSemanticData object to copy from |
| 424 | 300 | */ |
| — | — | @@ -440,10 +316,6 @@ |
| 441 | 317 | } |
| 442 | 318 | } |
| 443 | 319 | } |
| 444 | | - |
| 445 | | - foreach ( $semanticData->getAllChildren() as $subobjectName => $child ) { |
| 446 | | - $this->getChild( $subobjectName )->importDataFrom( $child ); |
| 447 | | - } |
| 448 | 320 | } |
| 449 | 321 | |
| 450 | 322 | } |
| \ No newline at end of file |
| Index: trunk/extensions/SemanticMediaWiki/includes/dataitems/SMW_DI_Container.php |
| — | — | @@ -97,8 +97,6 @@ |
| 98 | 98 | $this->mHasVisibleProps = $semanticData->hasVisibleProperties(); |
| 99 | 99 | $this->mHasVisibleSpecs = $semanticData->hasVisibleSpecialProperties(); |
| 100 | 100 | $this->mNoDuplicates = $semanticData->mNoDuplicates; |
| 101 | | - $this->mChildren = $semanticData->mChildren; |
| 102 | | - $this->mParentSemanticData = $semanticData->mParentSemanticData; |
| 103 | 101 | } |
| 104 | 102 | |
| 105 | 103 | } |
| Index: trunk/extensions/SemanticMediaWiki/includes/dataitems/SMW_DI_Property.php |
| — | — | @@ -335,6 +335,7 @@ |
| 336 | 336 | '_SKEY' => array( '__key', false ), // sort key of a page |
| 337 | 337 | '_SF_DF' => array( '__spf', true ), // Semantic Form's default form property |
| 338 | 338 | '_SF_AF' => array( '__spf', true ), // Semantic Form's alternate form property |
| | 339 | + '_SOBJ' => array( '_wpg', true ), // "has subobject" |
| 339 | 340 | ); |
| 340 | 341 | |
| 341 | 342 | foreach ( $datatypeLabels as $typeid => $label ) { |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageZh_cn.php |
| — | — | @@ -39,6 +39,7 @@ |
| 40 | 40 | '_anu' => 'URI的注解', // 'Annotation URI' // name of the annotation URI type (OWL annotation property) |
| 41 | 41 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 42 | 42 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 43 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 43 | 44 | ); |
| 44 | 45 | |
| 45 | 46 | protected $m_DatatypeAliases = array( |
| — | — | @@ -66,6 +67,7 @@ |
| 67 | 68 | '_MDAT' => 'Modification date', // TODO: translate |
| 68 | 69 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 69 | 70 | '_LIST' => 'Has fields', // TODO: translate |
| | 71 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 70 | 72 | ); |
| 71 | 73 | |
| 72 | 74 | |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageAr.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'التعليق علي معرف الموارد الموحد', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'رقم الهاتف', // name of the telephone (URI) type |
| 40 | 40 | '_rec' => 'تسجيل', // name of record data type |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -60,6 +61,7 @@ |
| 61 | 62 | '_MDAT' => 'تاريخ التعديل', |
| 62 | 63 | '_ERRP' => 'يمتلك قيمة غير صحيحة ل', |
| 63 | 64 | '_LIST' => 'يمتلك حقول', |
| | 65 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 64 | 66 | ); |
| 65 | 67 | |
| 66 | 68 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageEn.php |
| — | — | @@ -66,6 +66,7 @@ |
| 67 | 67 | '_MDAT' => 'Modification date', |
| 68 | 68 | '_ERRP' => 'Has improper value for', |
| 69 | 69 | '_LIST' => 'Has fields', |
| | 70 | + '_SOBJ' => 'Has subobject', |
| 70 | 71 | ); |
| 71 | 72 | |
| 72 | 73 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageEs.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'Anotación-URI', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -60,6 +61,7 @@ |
| 61 | 62 | '_MDAT' => 'Modification date', // TODO: translate |
| 62 | 63 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 63 | 64 | '_LIST' => 'Has fields', // TODO: translate |
| | 65 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 64 | 66 | ); |
| 65 | 67 | |
| 66 | 68 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageFr.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'Annotation-URI', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Numéro de téléphone', // name of the telephone (URI) type |
| 40 | 40 | '_rec' => 'Enregistrement', // name of record data type |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -60,6 +61,7 @@ |
| 61 | 62 | '_MDAT' => 'Date de modification', |
| 62 | 63 | '_ERRP' => 'A une valeur incorrecte pour', |
| 63 | 64 | '_LIST' => 'A le champ', |
| | 65 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 64 | 66 | ); |
| 65 | 67 | |
| 66 | 68 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageNl.php |
| — | — | @@ -39,6 +39,7 @@ |
| 40 | 40 | '_anu' => 'Annotatie-URI', // name of the annotation URI type (OWL annotation property) |
| 41 | 41 | '_tel' => 'Telefoonnummer', // name of the telephone (URI) type //TODO: translate |
| 42 | 42 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 43 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 43 | 44 | ); |
| 44 | 45 | |
| 45 | 46 | protected $m_DatatypeAliases = array( |
| — | — | @@ -63,6 +64,7 @@ |
| 64 | 65 | '_MDAT' => 'Wijzigingsdatum', |
| 65 | 66 | '_ERRP' => 'Heeft ongeldige waarde voor', |
| 66 | 67 | '_LIST' => 'Heeft velden', |
| | 68 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 67 | 69 | ); |
| 68 | 70 | |
| 69 | 71 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguagePl.php |
| — | — | @@ -56,6 +56,7 @@ |
| 57 | 57 | '_anu' => 'URI adnotacji', // name of the annotation URI type (OWL annotation property) |
| 58 | 58 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 59 | 59 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 60 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 60 | 61 | ); |
| 61 | 62 | |
| 62 | 63 | protected $m_DatatypeAliases = array( |
| — | — | @@ -79,6 +80,7 @@ |
| 80 | 81 | '_MDAT' => 'Modification date', // TODO: translate |
| 81 | 82 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 82 | 83 | '_LIST' => 'Has fields', // TODO: translate |
| | 84 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 83 | 85 | ); |
| 84 | 86 | |
| 85 | 87 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageIt.php |
| — | — | @@ -38,6 +38,7 @@ |
| 39 | 39 | '_anu' => 'Annotazione URI', // name of the annotation URI type (OWL annotation property) |
| 40 | 40 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 41 | 41 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 42 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 42 | 43 | ); |
| 43 | 44 | |
| 44 | 45 | protected $m_DatatypeAliases = array( |
| — | — | @@ -63,6 +64,7 @@ |
| 64 | 65 | '_MDAT' => 'Data di modifica', |
| 65 | 66 | '_ERRP' => 'Ha un valore improprio per', |
| 66 | 67 | '_LIST' => 'Has fields', // TODO: translate |
| | 68 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 67 | 69 | ); |
| 68 | 70 | |
| 69 | 71 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageNo.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'URI-merknad', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -67,6 +68,7 @@ |
| 68 | 69 | '_MDAT' => 'Endringsdato', |
| 69 | 70 | '_ERRP' => 'Feilaktig verdi for', |
| 70 | 71 | '_LIST' => 'Has fields', // TODO: translate |
| | 72 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 71 | 73 | ); |
| 72 | 74 | |
| 73 | 75 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageSk.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'URI anotácie', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -59,6 +60,7 @@ |
| 60 | 61 | '_MDAT' => 'Modification date', // TODO: translate |
| 61 | 62 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 62 | 63 | '_LIST' => 'Has fields', // TODO: translate |
| | 64 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 63 | 65 | ); |
| 64 | 66 | |
| 65 | 67 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_Language.php |
| — | — | @@ -80,6 +80,7 @@ |
| 81 | 81 | 'Modification date' => '_MDAT', |
| 82 | 82 | 'Has improper value for' => '_ERRP', |
| 83 | 83 | 'Has fields' => '_LIST', |
| | 84 | + 'Has subobject' => '_SOBJ', |
| 84 | 85 | ); |
| 85 | 86 | |
| 86 | 87 | |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguagePt.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'Anotação-URI', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -60,6 +61,7 @@ |
| 61 | 62 | '_MDAT' => 'Modification date', // TODO: translate |
| 62 | 63 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 63 | 64 | '_LIST' => 'Has fields', // TODO: translate |
| | 65 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 64 | 66 | ); |
| 65 | 67 | |
| 66 | 68 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageRu.php |
| — | — | @@ -63,6 +63,7 @@ |
| 64 | 64 | '_MDAT' => 'Дата последней правки', |
| 65 | 65 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 66 | 66 | '_LIST' => 'Имеет поля', |
| | 67 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 67 | 68 | ); |
| 68 | 69 | |
| 69 | 70 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageDe.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | '_anu' => 'URI-Annotation', // name of the annotation URI type (OWL annotation property) |
| 47 | 47 | '_tel' => 'Telefonnummer', // name of the telephone number URI datatype |
| 48 | 48 | '_rec' => 'Verbund', // name of record data type |
| 49 | | - '_qty' => 'Menge', // name of quantity data type |
| | 49 | + '_qty' => 'Maß', // name of quantity data type |
| 50 | 50 | ); |
| 51 | 51 | |
| 52 | 52 | protected $m_DatatypeAliases = array( |
| — | — | @@ -53,6 +53,7 @@ |
| 54 | 54 | 'Ganze Zahl' => '_num', |
| 55 | 55 | 'Dezimalzahl' => '_num', |
| 56 | 56 | 'Aufzählung' => '_str', |
| | 57 | + 'Menge' => '_qty' |
| 57 | 58 | ); |
| 58 | 59 | |
| 59 | 60 | protected $m_SpecialProperties = array( |
| — | — | @@ -69,6 +70,7 @@ |
| 70 | 71 | '_MDAT' => 'Zuletzt geändert', |
| 71 | 72 | '_ERRP' => 'Hat unpassenden Wert für', |
| 72 | 73 | '_LIST' => 'Hat Komponenten', |
| | 74 | + '_SOBJ' => 'Hat Unterobjekt', |
| 73 | 75 | ); |
| 74 | 76 | |
| 75 | 77 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageZh_tw.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'URI的註解', // 'Annotation URI' // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -64,6 +65,7 @@ |
| 65 | 66 | '_MDAT' => 'Modification date', // TODO: translate |
| 66 | 67 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 67 | 68 | '_LIST' => 'Has fields', // TODO: translate |
| | 69 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 68 | 70 | ); |
| 69 | 71 | |
| 70 | 72 | |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageId.php |
| — | — | @@ -40,6 +40,7 @@ |
| 41 | 41 | '_anu' => 'URI anotasi', // name of the annotation URI type (OWL annotation property) |
| 42 | 42 | '_tel' => 'Nomor telepon', // name of the telephone (URI) type |
| 43 | 43 | '_rec' => 'Rekaman', // name of record data type |
| | 44 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 44 | 45 | ); |
| 45 | 46 | |
| 46 | 47 | protected $m_DatatypeAliases = array( |
| — | — | @@ -62,6 +63,7 @@ |
| 63 | 64 | '_MDAT' => 'Tanggal modifikasi', |
| 64 | 65 | '_ERRP' => 'Memiliki nilai yang tidak tepat untuk', |
| 65 | 66 | '_LIST' => 'Memiliki bidang', |
| | 67 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 66 | 68 | ); |
| 67 | 69 | |
| 68 | 70 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageHe.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'מזהה יחודי לפירוש', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -62,6 +63,7 @@ |
| 63 | 64 | '_MDAT' => 'תאריך לשינוי', |
| 64 | 65 | '_ERRP' => 'יש ערך תקין בשביל', |
| 65 | 66 | '_LIST' => 'Has fields', // TODO: translate |
| | 67 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 66 | 68 | ); |
| 67 | 69 | |
| 68 | 70 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageArz.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | '_anu' => 'التعليق علي معرف الموارد الموحد', // name of the annotation URI type (OWL annotation property) |
| 39 | 39 | '_tel' => 'Telephone number', // name of the telephone (URI) type //TODO: translate |
| 40 | 40 | '_rec' => 'Record', // name of record data type //TODO: translate |
| | 41 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | protected $m_DatatypeAliases = array( |
| — | — | @@ -60,6 +61,7 @@ |
| 61 | 62 | '_MDAT' => 'Modification date', // TODO: translate |
| 62 | 63 | '_ERRP' => 'Has improper value for', // TODO: translate |
| 63 | 64 | '_LIST' => 'Has fields', // TODO: translate |
| | 65 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 64 | 66 | ); |
| 65 | 67 | |
| 66 | 68 | protected $m_SpecialPropertyAliases = array( |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_LanguageFi.php |
| — | — | @@ -39,6 +39,7 @@ |
| 40 | 40 | '_tel' => 'Puhelinnumero', // name of the telephone (URI) type |
| 41 | 41 | '_rec' => 'Tietue', // name of record data type |
| 42 | 42 | '_qty' => 'Määrä', // name of the number type with units of measurement |
| | 43 | + '_qty' => 'Quantity', // name of the number type with units of measurement //TODO: translate |
| 43 | 44 | ); |
| 44 | 45 | |
| 45 | 46 | protected $m_SpecialProperties = array( |
| — | — | @@ -55,6 +56,7 @@ |
| 56 | 57 | '_MDAT' => 'Muokkausaika', |
| 57 | 58 | '_ERRP' => 'Sopimaton arvo kentälle', |
| 58 | 59 | '_LIST' => 'Koostuu kentistä', |
| | 60 | + '_SOBJ' => 'Has subobject', // TODO: translate |
| 59 | 61 | ); |
| 60 | 62 | |
| 61 | 63 | protected $m_Namespaces = array( |