diff --git a/data/are_we_yet/game.md b/data/is_ocaml_yet/game.md similarity index 97% rename from data/are_we_yet/game.md rename to data/is_ocaml_yet/game.md index ffe0b7a36b..0eade4f802 100644 --- a/data/are_we_yet/game.md +++ b/data/is_ocaml_yet/game.md @@ -1,6 +1,6 @@ --- id: game -question: Are we game yet? +question: Is OCaml game yet? answer: Not exactly, but hey, we have some building blocks! categories: - name: Animation diff --git a/data/are_we_yet/gui.md b/data/is_ocaml_yet/gui.md similarity index 95% rename from data/are_we_yet/gui.md rename to data/is_ocaml_yet/gui.md index 90069545db..52059b7158 100644 --- a/data/are_we_yet/gui.md +++ b/data/is_ocaml_yet/gui.md @@ -1,6 +1,6 @@ --- id: gui -question: Are we GUI yet? +question: Is OCaml GUI yet? answer: Some hidden gems, we just need to a little bit of digging! categories: - name: Bindings diff --git a/data/are_we_yet/learning.md b/data/is_ocaml_yet/learning.md similarity index 97% rename from data/are_we_yet/learning.md rename to data/is_ocaml_yet/learning.md index b9620e2125..783a5830e3 100644 --- a/data/are_we_yet/learning.md +++ b/data/is_ocaml_yet/learning.md @@ -1,6 +1,6 @@ --- id: learning -question: Are we learning yet? +question: Is OCaml learning yet? answer: We're a bit late to the party, but we're catching up! categories: - name: Clustering diff --git a/data/are_we_yet/multicore.md b/data/is_ocaml_yet/multicore.md similarity index 92% rename from data/are_we_yet/multicore.md rename to data/is_ocaml_yet/multicore.md index 1a03757663..8194ad2ec0 100644 --- a/data/are_we_yet/multicore.md +++ b/data/is_ocaml_yet/multicore.md @@ -1,6 +1,6 @@ --- id: multicore -question: Are we multicore yet? +question: Is OCaml multicore yet? answer: OCaml 5 is out, now we need to build an ecosystem! categories: - name: Async IO diff --git a/data/are_we_yet/web.md b/data/is_ocaml_yet/web.md similarity index 99% rename from data/are_we_yet/web.md rename to data/is_ocaml_yet/web.md index 67497ee8c5..61d6e95013 100644 --- a/data/are_we_yet/web.md +++ b/data/is_ocaml_yet/web.md @@ -1,6 +1,6 @@ --- id: web -question: Are we web yet? +question: Is OCaml web yet? answer: Not quite yet, but we're getting there! categories: - name: Authentication diff --git a/src/global/url.ml b/src/global/url.ml index 6ed398fcc4..546d024ef9 100644 --- a/src/global/url.ml +++ b/src/global/url.ml @@ -79,4 +79,4 @@ let github_opam_file package_name package_version = "https://github.com/ocaml/opam-repository/blob/master/packages/%s/%s.%s/opam" package_name package_name package_version -let are_we_yet id = Printf.sprintf "/docs/are-we-%s-yet" id +let is_ocaml_yet id = Printf.sprintf "/docs/is-ocaml-%s-yet" id diff --git a/src/ocamlorg_data/data.ml b/src/ocamlorg_data/data.ml index 57e55b06d6..705bb1f735 100644 --- a/src/ocamlorg_data/data.ml +++ b/src/ocamlorg_data/data.ml @@ -167,6 +167,6 @@ module Code_example = struct let get title = List.find (fun x -> String.equal x.title title) all end -module Are_we_yet = struct - include Are_we_yet +module Is_ocaml_yet = struct + include Is_ocaml_yet end diff --git a/src/ocamlorg_data/data.mli b/src/ocamlorg_data/data.mli index ff665ba954..ab857424bb 100644 --- a/src/ocamlorg_data/data.mli +++ b/src/ocamlorg_data/data.mli @@ -397,7 +397,7 @@ module Code_example : sig val get : string -> t end -module Are_we_yet : sig +module Is_ocaml_yet : sig type category = { name : string; status : string; diff --git a/src/ocamlorg_data/dune b/src/ocamlorg_data/dune index f0406de228..f28cc8b25a 100644 --- a/src/ocamlorg_data/dune +++ b/src/ocamlorg_data/dune @@ -3,11 +3,11 @@ (public_name ocamlorg.data)) (rule - (target are_we_yet.ml) + (target is_ocaml_yet.ml) (action (with-stdout-to %{target} - (run %{dep:../../tool/ood-gen/bin/gen.exe} are_we_yet)))) + (run %{dep:../../tool/ood-gen/bin/gen.exe} is_ocaml_yet)))) (rule (target academic_institution.ml) diff --git a/src/ocamlorg_frontend/components/learn_sidebar.eml b/src/ocamlorg_frontend/components/learn_sidebar.eml index 120a59e6ab..19bdac6775 100644 --- a/src/ocamlorg_frontend/components/learn_sidebar.eml +++ b/src/ocamlorg_frontend/components/learn_sidebar.eml @@ -34,11 +34,11 @@ let render ~extra_html:((render_tutorial_link ~title:"Best Practices" ~slug:"best-practices") ^ (render_tutorial_link ~title:"OCaml Platform" ~slug:"platform")) %> - <%s! Learn_layout.sidebar_link_group "Are we Yet" - (tutorial_sidebar_links_by_category "are-we-yet") + <%s! Learn_layout.sidebar_link_group "Is OCaml Yet" + (tutorial_sidebar_links_by_category "is-ocaml-yet") ~extra_html:( - (render_tutorial_link ~title:"Are we game yet?" ~slug:"are-we-game-yet") - ^ (render_tutorial_link ~title:"Are we GUI yet?" ~slug:"are-we-gui-yet") - ^ (render_tutorial_link ~title:"Are we learning yet?" ~slug:"are-we-learning-yet") - ^ (render_tutorial_link ~title:"Are we multicore yet?" ~slug:"are-we-multicore-yet") - ^ (render_tutorial_link ~title:"Are we web yet?" ~slug:"are-we-web-yet")) %> + (render_tutorial_link ~title:"Is OCaml game yet?" ~slug:"is-ocaml-game-yet") + ^ (render_tutorial_link ~title:"Is OCaml GUI yet?" ~slug:"is-ocaml-gui-yet") + ^ (render_tutorial_link ~title:"Is OCaml learning yet?" ~slug:"is-ocaml-learning-yet") + ^ (render_tutorial_link ~title:"Is OCaml multicore yet?" ~slug:"is-ocaml-multicore-yet") + ^ (render_tutorial_link ~title:"Is OCaml web yet?" ~slug:"is-ocaml-web-yet")) %> diff --git a/src/ocamlorg_frontend/dune b/src/ocamlorg_frontend/dune index d3f7fdad1b..9ada29e683 100644 --- a/src/ocamlorg_frontend/dune +++ b/src/ocamlorg_frontend/dune @@ -42,9 +42,9 @@ --workspace %{workspace_root}))) (rule - (target are_we_yet.ml) + (target is_ocaml_yet.ml) (action - (run %{bin:dream_eml} %{dep:are_we_yet.eml} --workspace %{workspace_root}))) + (run %{bin:dream_eml} %{dep:is_ocaml_yet.eml} --workspace %{workspace_root}))) (rule (target best_practices.ml) (action diff --git a/src/ocamlorg_frontend/ocamlorg_frontend.ml b/src/ocamlorg_frontend/ocamlorg_frontend.ml index c8418b9764..be444cf9e4 100644 --- a/src/ocamlorg_frontend/ocamlorg_frontend.ml +++ b/src/ocamlorg_frontend/ocamlorg_frontend.ml @@ -6,7 +6,7 @@ module Package = Package let about = About.render let academic_users = Academic_users.render -let are_we_yet = Are_we_yet.render +let is_ocaml_yet = Is_ocaml_yet.render let best_practices = Best_practices.render let blog = Blog.render let blog_post = Blog_post.render diff --git a/src/ocamlorg_frontend/pages/are_we_yet.eml b/src/ocamlorg_frontend/pages/is_ocaml_yet.eml similarity index 84% rename from src/ocamlorg_frontend/pages/are_we_yet.eml rename to src/ocamlorg_frontend/pages/is_ocaml_yet.eml index c6129ab823..ef84a6ae31 100644 --- a/src/ocamlorg_frontend/pages/are_we_yet.eml +++ b/src/ocamlorg_frontend/pages/is_ocaml_yet.eml @@ -1,10 +1,10 @@ -let render (meta : Data.Are_we_yet.t) ~tutorials ~packages = +let render (meta : Data.Is_ocaml_yet.t) ~tutorials ~packages = Learn_layout.render ~title:meta.question ~description:(meta.question ^ " " ^ meta.answer) -~canonical:(Url.are_we_yet meta.id) +~canonical:(Url.is_ocaml_yet meta.id) ~active_top_nav_item:Header.Learn -~left_sidebar_html:(Learn_sidebar.render ~current_tutorial:(Some (Printf.sprintf "are-we-%s-yet" meta.id)) ~tutorials) +~left_sidebar_html:(Learn_sidebar.render ~current_tutorial:(Some (Printf.sprintf "is-ocaml-%s-yet" meta.id)) ~tutorials) ~right_sidebar_html:None @@

<%s meta.question %>

<%s meta.answer %>

@@ -12,7 +12,7 @@ Learn_layout.render <%s! meta.body_html %>

Details

- <% meta.categories |> List.iter (fun (category : Data.Are_we_yet.category) -> %> + <% meta.categories |> List.iter (fun (category : Data.Is_ocaml_yet.category) -> %>

<%s category.status %> <%s category.name %> diff --git a/src/ocamlorg_web/lib/handler.ml b/src/ocamlorg_web/lib/handler.ml index 043ee6efa3..e1fb08e304 100644 --- a/src/ocamlorg_web/lib/handler.ml +++ b/src/ocamlorg_web/lib/handler.ml @@ -382,14 +382,14 @@ let tutorial req = ~canonical:(Url.tutorial tutorial.slug) tutorial) -let are_we_yet t id req = +let is_ocaml_yet t id req = let? meta = - List.find_opt (fun x -> x.Data.Are_we_yet.id = id) Data.Are_we_yet.all + List.find_opt (fun x -> x.Data.Is_ocaml_yet.id = id) Data.Is_ocaml_yet.all in let tutorials = Data.Tutorial.all in let packages = meta.categories - |> List.concat_map (fun category -> category.Data.Are_we_yet.packages) + |> List.concat_map (fun category -> category.Data.Is_ocaml_yet.packages) |> List.map Ocamlorg_package.Name.of_string |> List.filter_map (fun name -> match Ocamlorg_package.get_latest t name with @@ -403,7 +403,7 @@ let are_we_yet t id req = |> List.map (fun pkg -> (pkg.Ocamlorg_frontend.Package.name, pkg)) |> List.to_seq |> Hashtbl.of_seq in - Dream.html (Ocamlorg_frontend.are_we_yet ~tutorials ~packages meta) + Dream.html (Ocamlorg_frontend.is_ocaml_yet ~tutorials ~packages meta) let best_practices _req = let tutorials = Data.Tutorial.all in diff --git a/src/ocamlorg_web/lib/router.ml b/src/ocamlorg_web/lib/router.ml index 16cd0bcccb..4e861204ae 100644 --- a/src/ocamlorg_web/lib/router.ml +++ b/src/ocamlorg_web/lib/router.ml @@ -50,11 +50,11 @@ let page_routes t = Dream.get Url.papers Handler.papers; Dream.get Url.best_practices Handler.best_practices; Dream.get Url.problems Handler.problems; - Dream.get (Url.tutorial "are-we-game-yet") (Handler.are_we_yet t "game"); - Dream.get (Url.tutorial "are-we-gui-yet") (Handler.are_we_yet t "gui"); - Dream.get (Url.tutorial "are-we-learning-yet") (Handler.are_we_yet t "learning"); - Dream.get (Url.tutorial "are-we-multicore-yet") (Handler.are_we_yet t "multicore"); - Dream.get (Url.tutorial "are-we-web-yet") (Handler.are_we_yet t "web"); + Dream.get (Url.tutorial "is-ocaml-game-yet") (Handler.is_ocaml_yet t "game"); + Dream.get (Url.tutorial "is-ocaml-gui-yet") (Handler.is_ocaml_yet t "gui"); + Dream.get (Url.tutorial "is-ocaml-learning-yet") (Handler.is_ocaml_yet t "learning"); + Dream.get (Url.tutorial "is-ocaml-multicore-yet") (Handler.is_ocaml_yet t "multicore"); + Dream.get (Url.tutorial "is-ocaml-web-yet") (Handler.is_ocaml_yet t "web"); Dream.get (Url.tutorial ":id") Handler.tutorial; Dream.get Url.playground Handler.playground; Dream.get Url.installer Handler.installer; diff --git a/tool/ood-gen/bin/gen.ml b/tool/ood-gen/bin/gen.ml index 0699e4e319..f0f3f306e8 100644 --- a/tool/ood-gen/bin/gen.ml +++ b/tool/ood-gen/bin/gen.ml @@ -2,7 +2,7 @@ open Cmdliner let term_templates = [ - ("are_we_yet", Ood_gen.Are_we_yet.template); + ("is_ocaml_yet", Ood_gen.Is_ocaml_yet.template); ("academic_institution", Ood_gen.Academic_institution.template); ("book", Ood_gen.Book.template); ("job", Ood_gen.Job.template); diff --git a/tool/ood-gen/lib/are_we_yet.ml b/tool/ood-gen/lib/is_ocaml_yet.ml similarity index 96% rename from tool/ood-gen/lib/are_we_yet.ml rename to tool/ood-gen/lib/is_ocaml_yet.ml index 24a9a3f423..970ae3aeb4 100644 --- a/tool/ood-gen/lib/are_we_yet.ml +++ b/tool/ood-gen/lib/is_ocaml_yet.ml @@ -46,7 +46,7 @@ let decode (_, (head, body_md)) = of_metadata ~body_html metadata) metadata -let all () = Utils.map_files decode "are_we_yet" +let all () = Utils.map_files decode "is_ocaml_yet" let template () = Format.asprintf