[Stacomir-commits] r253 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jan 27 09:35:25 CET 2017
Author: timothee_besse
Date: 2017-01-27 09:35:25 +0100 (Fri, 27 Jan 2017)
New Revision: 253
Modified:
pkg/stacomir/R/BilanAgedemer.r
pkg/stacomir/R/BilanAnnuels.r
pkg/stacomir/R/BilanArgentee.r
pkg/stacomir/R/BilanEspeces.r
pkg/stacomir/R/BilanFonctionnementDC.r
pkg/stacomir/R/BilanMigration.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/BilanMigrationMult.r
pkg/stacomir/R/BilanMigrationPar.r
Log:
Correction des messages ref 1->12
Modified: pkg/stacomir/R/BilanAgedemer.r
===================================================================
--- pkg/stacomir/R/BilanAgedemer.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanAgedemer.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -106,34 +106,34 @@
if (exists("refDC",envir_stacomi)) {
object at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
object at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)) {
object at stades<-get("refStades",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("refpar",envir_stacomi)) {
object at par<-get("refpar",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.4),arret=TRUE)
+ funout(gettext("You need to choose a parameter, clic on validate\n"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilan_adm_date_debut",envir_stacomi)) {
object at horodatedebut@horodate<-get("bilan_adm_date_debut",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.5),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n"),arret=TRUE)
}
# rem id
if (exists("bilan_adm_date_fin",envir_stacomi)) {
object at horodatefin@horodate<-get("bilan_adm_date_fin",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.6),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n"),arret=TRUE)
}
return(object)
Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanAnnuels.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -43,28 +43,28 @@
if (exists("refDC",envir_stacomi)) {
bilA at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
bilA at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)){
bilA at stades<-get("refStades",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("anneedebut",envir_stacomi)) {
bilA at anneedebut<-get("anneedebut",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.10),arret=TRUE)
+ funout(gettext("You need to choose the starting year\n"),arret=TRUE)
}
if (exists("anneefin",envir_stacomi)) {
bilA at anneefin<-get("anneefin",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.11),arret=TRUE)
+ funout(gettext("You need to choose the ending year\n"),arret=TRUE)
}
assign("bilanAnnuels",bilA,envir_stacomi)
funout(gettext(get("msg",envir_stacomi)$BilanAnnuels.1))
Modified: pkg/stacomir/R/BilanArgentee.r
===================================================================
--- pkg/stacomir/R/BilanArgentee.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanArgentee.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -101,34 +101,34 @@
if (exists("refDC",envir_stacomi)) {
object at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
object at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)) {
object at stades<-get("refStades",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("refpar",envir_stacomi)) {
object at par<-get("refpar",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.4),arret=TRUE)
+ funout(gettext("You need to choose a parameter, clic on validate\n"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilan_arg_date_debut",envir_stacomi)) {
object at horodatedebut@horodate<-get("bilan_arg_date_debut",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.5),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n"),arret=TRUE)
}
# rem id
if (exists("bilan_arg_date_fin",envir_stacomi)) {
object at horodatefin@horodate<-get("bilan_arg_date_fin",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.6),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n"),arret=TRUE)
}
return(object)
Modified: pkg/stacomir/R/BilanEspeces.r
===================================================================
--- pkg/stacomir/R/BilanEspeces.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanEspeces.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -114,7 +114,7 @@
if (exists("refDC",envir_stacomi)) {
bilanEspeces at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilanEspeces_date_debut",envir_stacomi)) {
Modified: pkg/stacomir/R/BilanFonctionnementDC.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDC.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanFonctionnementDC.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -79,18 +79,18 @@
if (exists("refDC",envir_stacomi)) {
object at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE) }
+ funout("You need to choose a counting device, clic on validate\n"),arret=TRUE) }
if (exists("bilanFonctionnementDC_date_debut",envir_stacomi)) {
object at horodatedebut@horodate<-get("bilanFonctionnementDC_date_debut",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.5),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n"),arret=TRUE)
}
if (exists("bilanFonctionnementDC_date_fin",envir_stacomi)) {
object at horodatefin@horodate<-get("bilanFonctionnementDC_date_fin",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.6),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n"),arret=TRUE)
}
return(object)
})
Modified: pkg/stacomir/R/BilanMigration.r
===================================================================
--- pkg/stacomir/R/BilanMigration.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanMigration.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -132,18 +132,18 @@
dc<-bilanMigration at dc@dc_selectionne
df<-bilanMigration at dc@data$df[bilanMigration at dc@data$dc%in%dc]
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
bilanMigration at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)){
bilanMigration at stades<-get("refStades",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("pasDeTemps",envir_stacomi)){
bilanMigration at pasDeTemps<-get("pasDeTemps",envir_stacomi)
Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -129,28 +129,28 @@
if (exists("refDC",envir_stacomi)) {
bilanMigrationInterAnnuelle at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
bilanMigrationInterAnnuelle at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)){
bilanMigrationInterAnnuelle at stades<-get("refStades",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("anneeDebut",envir_stacomi)) {
bilanMigrationInterAnnuelle at anneeDebut<-get("anneeDebut",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.10),arret=TRUE)
+ funout(gettext("You need to choose the starting year\n"),arret=TRUE)
}
if (exists("anneeFin",envir_stacomi)) {
bilanMigrationInterAnnuelle at anneeFin<-get("anneeFin",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.11),arret=TRUE)
+ funout(gettext("You need to choose the ending year\n"),arret=TRUE)
}
assign("bilanMigrationInterAnnuelle",bilanMigrationInterAnnuelle,envir_stacomi)
funout(gettext(get("msg",envir_stacomi)$BilanMigrationInterannuelle.11))
Modified: pkg/stacomir/R/BilanMigrationMult.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMult.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanMigrationMult.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -77,18 +77,18 @@
dc<-bilanMigrationMult at dc@dc_selectionne
df<-bilanMigrationMult at dc@data$df[bilanMigrationMult at dc@data$dc%in%dc]
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
bilanMigrationMult at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)){
bilanMigrationMult at stades<-get("refStades",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("pasDeTemps",envir_stacomi)){
bilanMigrationMult at pasDeTemps<-get("pasDeTemps",envir_stacomi)
Modified: pkg/stacomir/R/BilanMigrationPar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationPar.r 2017-01-26 21:42:08 UTC (rev 252)
+++ pkg/stacomir/R/BilanMigrationPar.r 2017-01-27 08:35:25 UTC (rev 253)
@@ -86,18 +86,18 @@
if (exists("refDC",envir_stacomi)) {
bilanMigrationPar at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.1),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
bilanMigrationPar at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.2),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)){
bilanMigrationPar at stades<-get("refStades",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.3),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
}
if (exists("pasDeTemps",envir_stacomi)){
bilanMigrationPar at pasDeTemps<-get("pasDeTemps",envir_stacomi)
@@ -119,13 +119,13 @@
bilanMigrationPar at parquan<-get("refparquan",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.7),arret=TRUE)
+ funout(gettext("You need to choose a quantitative parameter\n"),arret=TRUE)
}
if (exists("refparqual",envir_stacomi)){
bilanMigrationPar at parqual<-get("refparqual",envir_stacomi)
} else
{
- funout(gettext(get("msg",envir_stacomi)$ref.8),arret=TRUE)
+ funout(gettext("You need to choose a qualitative parameter\n"),arret=TRUE)
}
stopifnot(validObject(bilanMigrationPar, test=TRUE))
More information about the Stacomir-commits
mailing list