Skip to content

Commit

Permalink
Refactor and remove placeholder i18n func
Browse files Browse the repository at this point in the history
  • Loading branch information
@knadh
knadh committed Jan 23, 2021
1 parent 810607e commit 4cd5e6e
Show file tree
Hide file tree
Showing 11 changed files with 121 additions and 153 deletions.
14 changes: 3 additions & 11 deletions cmd/admin.go
View file
Expand Up @@ -72,9 +72,7 @@ func handleGetConfigScript(c echo.Context) error {
j := json.NewEncoder(&b)
if err := j.Encode(out); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts("admin.errorMarshallingConfig", map[string]string{
"error": err.Error(),
}))
app.i18n.Ts("admin.errorMarshallingConfig", "error", err.Error()))
}
return c.Blob(http.StatusOK, "application/javascript; charset=utf-8", b.Bytes())
}
Expand All @@ -88,10 +86,7 @@ func handleGetDashboardCharts(c echo.Context) error {

if err := app.queries.GetDashboardCharts.Get(&out); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts("globals.messages.errorFetching", map[string]string{
"name": "dashboard charts",
"error": pqErrMsg(err),
}))
app.i18n.Ts("globals.messages.errorFetching", "name", "dashboard charts", "error", pqErrMsg(err)))
}

return c.JSON(http.StatusOK, okResp{out})
Expand All @@ -106,10 +101,7 @@ func handleGetDashboardCounts(c echo.Context) error {

if err := app.queries.GetDashboardCounts.Get(&out); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts("globals.messages.errorFetching", map[string]string{
"name": "dashboard stats",
"error": pqErrMsg(err),
}))
app.i18n.Ts("globals.messages.errorFetching", "name", "dashboard stats", "error", pqErrMsg(err)))
}

return c.JSON(http.StatusOK, okResp{out})
Expand Down
65 changes: 31 additions & 34 deletions cmd/campaigns.go
View file
Expand Up @@ -106,12 +106,12 @@ func handleGetCampaigns(c echo.Context) error {
if err := db.Select(&out.Results, stmt, id, pq.StringArray(status), query, pg.Offset, pg.Limit); err != nil {
app.log.Printf("error fetching campaigns: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}
if single && len(out.Results) == 0 {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("campaigns.notFound", "name", "{globals.terms.campaign}"))
app.i18n.Ts("campaigns.notFound", "name", "{globals.terms.campaign}"))
}
if len(out.Results) == 0 {
out.Results = []models.Campaign{}
Expand All @@ -133,7 +133,7 @@ func handleGetCampaigns(c echo.Context) error {
if err := out.Results.LoadStats(app.queries.GetCampaignStats); err != nil {
app.log.Printf("error fetching campaign stats: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand Down Expand Up @@ -167,12 +167,12 @@ func handlePreviewCampaign(c echo.Context) error {
if err != nil {
if err == sql.ErrNoRows {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("globals.messages.notFound", "name", "{globals.terms.campaign}"))
app.i18n.Ts("globals.messages.notFound", "name", "{globals.terms.campaign}"))
}

app.log.Printf("error fetching campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand All @@ -185,7 +185,7 @@ func handlePreviewCampaign(c echo.Context) error {
} else {
app.log.Printf("error fetching subscriber: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.subscriber}", "error", pqErrMsg(err)))
}
}
Expand All @@ -198,15 +198,15 @@ func handlePreviewCampaign(c echo.Context) error {
if err := camp.CompileTemplate(app.manager.TemplateFuncs(camp)); err != nil {
app.log.Printf("error compiling template: %v", err)
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("templates.errorCompiling", "error", err.Error()))
app.i18n.Ts("templates.errorCompiling", "error", err.Error()))
}

// Render the message body.
m := app.manager.NewCampaignMessage(camp, sub)
if err := m.Render(); err != nil {
app.log.Printf("error rendering message: %v", err)
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("templates.errorRendering", "error", err.Error()))
app.i18n.Ts("templates.errorRendering", "error", err.Error()))
}

return c.HTML(http.StatusOK, string(m.Body()))
Expand Down Expand Up @@ -244,7 +244,7 @@ func handleCreateCampaign(c echo.Context) error {
if err != nil {
app.log.Printf("error generating UUID: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorUUID", "error", err.Error()))
app.i18n.Ts("globals.messages.errorUUID", "error", err.Error()))
}

// Insert and read ID.
Expand All @@ -269,7 +269,7 @@ func handleCreateCampaign(c echo.Context) error {

app.log.Printf("error creating campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorCreating",
app.i18n.Ts("globals.messages.errorCreating",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand All @@ -296,12 +296,12 @@ func handleUpdateCampaign(c echo.Context) error {
if err := app.queries.GetCampaign.Get(&cm, id, nil); err != nil {
if err == sql.ErrNoRows {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.notFound", "name", "{globals.terms.campaign}"))
app.i18n.Ts("globals.messages.notFound", "name", "{globals.terms.campaign}"))
}

app.log.Printf("error fetching campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand Down Expand Up @@ -336,7 +336,7 @@ func handleUpdateCampaign(c echo.Context) error {
if err != nil {
app.log.Printf("error updating campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorUpdating",
app.i18n.Ts("globals.messages.errorUpdating",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand All @@ -358,15 +358,12 @@ func handleUpdateCampaignStatus(c echo.Context) error {
if err := app.queries.GetCampaign.Get(&cm, id, nil); err != nil {
if err == sql.ErrNoRows {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts("", map[string]string{
"name": "{globals.terms.campaign}",
}))
app.i18n.Ts("globals.message.notFound", "name", "{globals.terms.campaign}"))
}

app.log.Printf("error fetching campaign: %v", err)

return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand Down Expand Up @@ -413,13 +410,13 @@ func handleUpdateCampaignStatus(c echo.Context) error {
app.log.Printf("error updating campaign status: %v", err)

return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorUpdating",
app.i18n.Ts("globals.messages.errorUpdating",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

if n, _ := res.RowsAffected(); n == 0 {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("globals.messages.notFound",
app.i18n.Ts("globals.messages.notFound",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand All @@ -442,20 +439,20 @@ func handleDeleteCampaign(c echo.Context) error {
if err := app.queries.GetCampaign.Get(&cm, id, nil); err != nil {
if err == sql.ErrNoRows {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("globals.messages.notFound",
app.i18n.Ts("globals.messages.notFound",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

app.log.Printf("error fetching campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

if _, err := app.queries.DeleteCampaign.Exec(cm.ID); err != nil {
app.log.Printf("error deleting campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorDeleting",
app.i18n.Ts("globals.messages.errorDeleting",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))

}
Expand All @@ -477,7 +474,7 @@ func handleGetRunningCampaignStats(c echo.Context) error {

app.log.Printf("error fetching campaign stats: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
} else if len(out) == 0 {
return c.JSON(http.StatusOK, okResp{[]struct{}{}})
Expand Down Expand Up @@ -539,7 +536,7 @@ func handleTestCampaign(c echo.Context) error {
if err := app.queries.GetSubscribersByEmails.Select(&subs, req.SubscriberEmails); err != nil {
app.log.Printf("error fetching subscribers: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.subscribers}", "error", pqErrMsg(err)))
} else if len(subs) == 0 {
return echo.NewHTTPError(http.StatusBadRequest, app.i18n.T("campaigns.noKnownSubsToTest"))
Expand All @@ -550,13 +547,13 @@ func handleTestCampaign(c echo.Context) error {
if err := app.queries.GetCampaignForPreview.Get(&camp, campID); err != nil {
if err == sql.ErrNoRows {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("globals.messages.notFound",
app.i18n.Ts("globals.messages.notFound",
"name", "{globals.terms.campaign}"))
}

app.log.Printf("error fetching campaign: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.campaign}", "error", pqErrMsg(err)))
}

Expand All @@ -574,7 +571,7 @@ func handleTestCampaign(c echo.Context) error {
sub := s
if err := sendTestMessage(sub, &camp, app); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("campaigns.errorSendTest", "error", err.Error()))
app.i18n.Ts("campaigns.errorSendTest", "error", err.Error()))
}
}

Expand All @@ -586,15 +583,15 @@ func sendTestMessage(sub models.Subscriber, camp *models.Campaign, app *App) err
if err := camp.CompileTemplate(app.manager.TemplateFuncs(camp)); err != nil {
app.log.Printf("error compiling template: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("templates.errorCompiling", "error", err.Error()))
app.i18n.Ts("templates.errorCompiling", "error", err.Error()))
}

// Render the message body.
m := app.manager.NewCampaignMessage(camp, sub)
if err := m.Render(); err != nil {
app.log.Printf("error rendering message: %v", err)
return echo.NewHTTPError(http.StatusNotFound,
app.i18n.Ts2("templates.errorRendering", "error", err.Error()))
app.i18n.Ts("templates.errorRendering", "error", err.Error()))
}

return app.messengers[camp.Messenger].Push(messenger.Message{
Expand Down Expand Up @@ -641,12 +638,12 @@ func validateCampaignFields(c campaignReq, app *App) (campaignReq, error) {
}

if !app.manager.HasMessenger(c.Messenger) {
return c, errors.New(app.i18n.Ts2("campaigns.fieldInvalidMessenger", "name", c.Messenger))
return c, errors.New(app.i18n.Ts("campaigns.fieldInvalidMessenger", "name", c.Messenger))
}

camp := models.Campaign{Body: c.Body, TemplateBody: tplTag}
if err := c.CompileTemplate(app.manager.TemplateFuncs(&camp)); err != nil {
return c, errors.New(app.i18n.Ts2("campaigns.fieldInvalidBody", "error", err.Error()))
return c, errors.New(app.i18n.Ts("campaigns.fieldInvalidBody", "error", err.Error()))
}

return c, nil
Expand All @@ -672,7 +669,7 @@ func makeOptinCampaignMessage(o campaignReq, app *App) (campaignReq, error) {
if err != nil {
app.log.Printf("error fetching lists for opt-in: %s", pqErrMsg(err))
return o, echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("globals.messages.errorFetching",
app.i18n.Ts("globals.messages.errorFetching",
"name", "{globals.terms.list}", "error", pqErrMsg(err)))
}

Expand All @@ -697,7 +694,7 @@ func makeOptinCampaignMessage(o campaignReq, app *App) (campaignReq, error) {
}{lists, optinURLAttr}); err != nil {
app.log.Printf("error compiling 'optin-campaign' template: %v", err)
return o, echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("templates.errorCompiling", "error", err.Error()))
app.i18n.Ts("templates.errorCompiling", "error", err.Error()))
}

o.Body = b.String()
Expand Down
12 changes: 6 additions & 6 deletions cmd/import.go
View file
Expand Up @@ -33,7 +33,7 @@ func handleImportSubscribers(c echo.Context) error {
var r reqImport
if err := json.Unmarshal([]byte(c.FormValue("params")), &r); err != nil {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("import.invalidParams", "error", err.Error()))
app.i18n.Ts("import.invalidParams", "error", err.Error()))
}

if r.Mode != subimporter.ModeSubscribe && r.Mode != subimporter.ModeBlocklist {
Expand All @@ -47,7 +47,7 @@ func handleImportSubscribers(c echo.Context) error {
file, err := c.FormFile("file")
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest,
app.i18n.Ts2("import.invalidFile", "error", err.Error()))
app.i18n.Ts("import.invalidFile", "error", err.Error()))
}

src, err := file.Open()
Expand All @@ -59,20 +59,20 @@ func handleImportSubscribers(c echo.Context) error {
out, err := ioutil.TempFile("", "listmonk")
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("import.errorCopyingFile", "error", err.Error()))
app.i18n.Ts("import.errorCopyingFile", "error", err.Error()))
}
defer out.Close()

if _, err = io.Copy(out, src); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("import.errorCopyingFile", "error", err.Error()))
app.i18n.Ts("import.errorCopyingFile", "error", err.Error()))
}

// Start the importer session.
impSess, err := app.importer.NewSession(file.Filename, r.Mode, r.Overwrite, r.ListIDs)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("import.errorStarting", "error", err.Error()))
app.i18n.Ts("import.errorStarting", "error", err.Error()))
}
go impSess.Start()

Expand All @@ -88,7 +88,7 @@ func handleImportSubscribers(c echo.Context) error {
dir, files, err := impSess.ExtractZIP(out.Name(), 1)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
app.i18n.Ts2("import.errorProcessingZIP", "error", err.Error()))
app.i18n.Ts("import.errorProcessingZIP", "error", err.Error()))
}
go impSess.LoadCSV(dir+"/"+files[0], rune(r.Delim[0]))
}
Expand Down

0 comments on commit 4cd5e6e

Please sign in to comment.