[Stacomir-commits] r249 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Jan 26 21:44:03 CET 2017
Author: timothee_besse
Date: 2017-01-26 21:44:03 +0100 (Thu, 26 Jan 2017)
New Revision: 249
Modified:
pkg/stacomir/R/Bilan_poids_moyen.r
pkg/stacomir/R/Bilan_stades_pigm.r
Log:
Premi?\195?\168res corrections des messages gettext
Modified: pkg/stacomir/R/Bilan_poids_moyen.r
===================================================================
--- pkg/stacomir/R/Bilan_poids_moyen.r 2017-01-26 20:18:56 UTC (rev 248)
+++ pkg/stacomir/R/Bilan_poids_moyen.r 2017-01-26 20:44:03 UTC (rev 249)
@@ -238,15 +238,15 @@
p<-ggplot2::qplot(x=date,y=w,data=don)
print(p)
assign("p",p,envir=envir_stacomi)
- if (!silent) funout("ggplot object p assigned to envir_stacomi")
+ if (!silent) funout(gettext("ggplot object p assigned to envir_stacomi"))
####################"
# standard plot
##################
} else if (plot.type==2){
type_poids= switch (bilPM at liste@selectedvalue,
- ">1"=gettext("wet weights "),
- "=1"=gettext("dry weights "),
- "tous"=gettext("wet and dry weights "))
+ ">1"=gettext("wet weights"),
+ "=1"=gettext("dry weights"),
+ "tous"=gettext("wet and dry weights"))
plot(x=don$date,y=don$w,
xlab=gettext("date"),
ylab=gettext("mean weights"),
@@ -265,7 +265,7 @@
p<-ggplot2::qplot(x=date,y=w,data=don)
print(p+aes(size=effectif))
assign("p",p,envir=envir_stacomi)
- if (!silent) funout("object p assigned to envir_stacomi")
+ if (!silent) funout(gettext("object p assigned to envir_stacomi"))
}
})
Modified: pkg/stacomir/R/Bilan_stades_pigm.r
===================================================================
--- pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-26 20:18:56 UTC (rev 248)
+++ pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-26 20:44:03 UTC (rev 249)
@@ -102,7 +102,7 @@
" AND lot_std_code= 'CIV'",
" AND car_par_code='1791'",sep="")
requete<-stacomirtools::connect(requete) # appel de la methode stacomirtools::connect de l'object ODBCWHEREDATE
- funout(gettext(get("msg",envir_stacomi)$Bilan_stades_pigm.1))
+ funout(gettext("Pigmentation stages loading query completed"))
object at data<-stacomirtools::killfactor(requete at query)
if (nrow (requete at query)>0) {
@@ -139,14 +139,14 @@
tmp<-vector_to_listsql(object at stationMesure@data$stm_identifiant)
requete at and=paste(" AND env_stm_identifiant IN ",tmp )
requete<-stacomirtools::connect(requete)
- funout(gettext(get("msg",envir=envir_stacomi)$BilanCondtionEnv.1))
+ funout(gettext("Environmental conditions loading query completed"))
if (nrow (requete at query)>0) {
- if (unique(requete at query$env_stm_identifiant)>1) funout("vous avez choisi plusieurs stations", arret=TRUE)
+ if (unique(requete at query$env_stm_identifiant)>1) funout(gettext("You chose several stations"), arret=TRUE)
object at datatempsal<-stacomirtools::killfactor(requete at query)[,c("env_date_debut","env_valeur_quantitatif")]
object at datatempsal$salinite=as.numeric(object at salinite@label)
colnames(object at datatempsal)<-c("date","temperature","salinite")
} else {
- funout("pas de donnees de temperature, vous ne pourrez pas faire de retrocalcul des dates d'arrivees")
+ funout(gettext("no temperature data, you won't be able to retrocalculate arrival dates"))
}
}
return(object)
@@ -218,18 +218,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(gettext("You need to choose a counting device, clic on validate"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilan_stades_pigm_date_debut",envir_stacomi)) {
object at datedebut<-get("bilan_stades_pigm_date_debut",envir_stacomi)@horodate
} 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("bilan_stades_pigm_date_fin",envir_stacomi)) {
object at datefin<-get("bilan_stades_pigm_date_fin",envir_stacomi)@horodate
} else {
- funout(gettext(get("msg",envir_stacomi)$ref.6),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n"),arret=TRUE)
}
if (exists("refCheckBox",envir_stacomi)) {
object at options<-get("refCheckBox",envir_stacomi)
@@ -252,7 +252,7 @@
if (exists("refStationMesure",envir_stacomi)) {
object at stationMesure<-get("refStationMesure",envir_stacomi)
} else {
- funout(gettext(get("msg",envir=envir_stacomi)$BilanCondtionEnv.2),arret=TRUE)
+ funout(gettext("You need to choose a monitoring station, clic on validate\n"),arret=TRUE)
}
}
object<-connect(object)
@@ -492,14 +492,14 @@
}
funout("Chargement des donnees dans la base ")
dates<-bilan_stades_pigm at dates
- bilan_stades_pigm at labelgraphstades<-paste(gettext(get("msg",envir=envir_stacomi)$Bilan_stades_pigm.4),
+ bilan_stades_pigm at labelgraphstades<-paste(gettext("Pigmentation stages"),
if(strftime(as.POSIXlt(dates[1]),"%Y")==
strftime(as.POSIXlt(dates[length(dates)]),"%Y")) {
strftime(as.POSIXlt(dates[1]),"%Y")} else { paste(
strftime(as.POSIXlt(dates[1]),"%Y"),"-",
strftime(as.POSIXlt(dates[length(dates)]),"%Y"))},
- gettext(get("msg",envir=envir_stacomi)$Bilan_stades_pigm.5))
- bilan_stades_pigm at labelretro="dates d'arrivees en estuaires"
+ gettext("and incoming dates in estuary"))
+ bilan_stades_pigm at labelretro=gettext("incoming dates in estuary")
enabled(toolbarlist[["SetTitle"]])<-TRUE
enabled(toolbarlist[["Graph"]])<-TRUE
enabled(toolbarlist[["Graphgg"]])<-TRUE
@@ -787,7 +787,7 @@
ggtitle("Stades pigmentaires")+xlab("")+ylab("effectifs")
print(g)
assign("g",g,"envir_stacomi")
- funout("l'object graphique est disponible dans l'environnement principal, tapper g<-get('g',envir=envir_stacomi)")
+ funout(gettext("The graphic object is available in the main environment, write g<-get('g',envir=envir_stacomi)"))
}
More information about the Stacomir-commits
mailing list