fix rebase conflict

R/confirmatoryfactoranalysis.R

@@ -14,11 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# This is a temporary fix
-# TODO: remove it when R will solve this problem!
-gettextf <- function(fmt, ..., domain = NULL)  {
-  return(sprintf(gettext(fmt, domain = domain), ...))
-}
+
 
 confirmatoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...) {
   jaspResults$addCitation("Rosseel, Y. (2012). lavaan: An R Package for Structural Equation Modeling. Journal of Statistical Software, 48(2), 1-36. URL http://www.jstatsoft.org/v48/i02/")
@@ -203,6 +199,12 @@ confirmatoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ..
                      "diagonallyWeightedLeastSquares"  = "DWLS"
   )
 
+  if (anyNA(dataset)) {
+    naAction <- ifelse(options$naAction == "twoStageRobust", "robust.two.stage",
+                       ifelse(options$naAction == "twoStage", "two.stage", options$naAction))
+  } else {
+    naAction <- "default"
+  }
 
   cfaResult[["lav"]] <- try(lavaan::lavaan(
     model           = mod,
@@ -226,8 +228,7 @@ confirmatoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ..
     auto.cov.y      = TRUE,
     mimic           = options$packageMimiced,
     estimator       = estimator,
-    missing         = ifelse(options$naAction == "twoStageRobust", "robust.two.stage",
-                             ifelse(options$naAction == "twoStage", "two.stage", options$naAction))
+    missing         = naAction
   ))
 
   # are there ordered variables in the data?

po/R-ja.po

@@ -1,17 +1,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: jaspFactor 0.13.0\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2024-07-13 03:29\n"
 "PO-Revision-Date: 2024-07-02 15:09+0000\n"
 "Last-Translator: Daiki Hojo <[email protected]>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/jasp/jaspfactor-"
 "r/ja/>\n"
+=======
+"POT-Creation-Date: 2023-05-08 16:33\n"
+"PO-Revision-Date: 2024-06-24 10:09+0000\n"
+"Last-Translator: 上野真翔 <[email protected]>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/jasp/"
+"jaspfactor-r/ja/>\n"
+>>>>>>> 1eb6579 (Translated using Weblate (Japanese) (#229))
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+<<<<<<< HEAD
 "X-Generator: Weblate 5.7-dev\n"
+=======
+"X-Generator: Weblate 5.6-rc\n"
+>>>>>>> 1eb6579 (Translated using Weblate (Japanese) (#229))
 
 msgid "Second-Order"
 msgstr "二次"
@@ -334,7 +346,7 @@ msgid "Average variance extracted"
 msgstr "平均分散抽出"
 
 msgid "AVE"
-msgstr "AVE"
+msgstr ""
 
 msgid "Heterotrait-monotrait ratio"
 msgstr "Heterotrait-monotrait 比"