Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2926 → Rev 2928

/branches/v2.25-scarificateur/jrest/services/Inventory.php
81,7 → 81,10
throw new Exception('Date invalide');
}
}
 
// une nom de bdtfxr est en fait un nom de bdtfx
if ($pairs['nom_referentiel'] == 'bdtfxr') {
$pairs['nom_referentiel'] = 'bdtfx';
}
$gestionnaire_observation = new GestionObservation($this->config);
$modification_observation = $gestionnaire_observation->modifierObservation($uid[0],$uid[1],$pairs);
 
/branches/v2.25-scarificateur/jrest/services
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest/services:r2924-2927
/branches/v2.25-scarificateur/jrest
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest:r2924,2926-2927
/branches/v2.25-scarificateur/war/i18n/messages_en.js
366,6 → 366,7
"phenologie-95" : "95: 50% of leaves have changed color",
"referentiel-bdtfx" : "Metropolitan France (BDTFX)",
"referentiel-bdtfxr" : "Metropolitan France (reduced index)",
"referentiel-bdtxa" : "French Antilles (BDTXA)",
"referentiel-bdtre" : "Reunion Island (BDTRE)",
"referentiel-isfan" : "North Africa (ISFAN)",
/branches/v2.25-scarificateur/war/i18n/messages_fr.js
367,6 → 367,7
"phenologie-95": "95: par ex, environ 50% des feuilles jaunes",
"referentiel-bdtfx" : "Métropole (BDTFX)",
"referentiel-bdtfxr" : "Métropole (index réduit)",
"referentiel-bdtxa" : "Antilles Françaises (BDTXA)",
"referentiel-bdtre" : "Réunion (BDTRE)",
"referentiel-isfan" : "Afrique du Nord (ISFAN)",
/branches/v2.25-scarificateur/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r2924,2926-2927